]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
authorChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 16:33:42 +0000 (12:33 -0400)
committerChris Mason <chris.mason@oracle.com>
Sun, 22 May 2011 16:33:42 +0000 (12:33 -0400)
commit945d8962ceee6bb273365d0bdf42f763225b290f
tree43f5617022c7c947c3c63664e49eb9575ab82f2f
parent0d0ca30f180906224be6279788f2b202cfd959d8
parent4ea028859bbdad34b84c9951fbb832ae10c6a96c
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers

Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
23 files changed:
fs/btrfs/acl.c
fs/btrfs/compression.c
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/delayed-inode.c
fs/btrfs/dir-item.c
fs/btrfs/disk-io.c
fs/btrfs/disk-io.h
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file-item.c
fs/btrfs/file.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode-map.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/relocation.c
fs/btrfs/super.c
fs/btrfs/sysfs.c
fs/btrfs/transaction.c
fs/btrfs/transaction.h
fs/btrfs/tree-log.c
fs/btrfs/xattr.c