]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
projects / mirror_ubuntu-eoan-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8e531cd 1f78160)
Merge branch 'cleanups_and_fixes' into inode_numbers
authorChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
committerChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
commitd6c0cb379c5198487e4ac124728cbb2346d63b1f
tree167a97ac58c7a2fbf7c4e94b6abbfe1e03af014atree
parent8e531cdfeb75269c6c5aae33651cca39707848dacommit | diff
parent1f78160ce1b1b8e657e2248118c4d91f881763f0commit | diff
Merge branch 'cleanups_and_fixes' into inode_numbers

Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
14 files changed:
fs/btrfs/ctree.c diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/dir-item.c diff1 | diff2 | blob | history
fs/btrfs/disk-io.c diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/file-item.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/root-tree.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
fs/btrfs/tree-log.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
fs/btrfs/volumes.h diff1 | diff2 | blob | history
Ubuntu Eoan Linux kernel mirror