Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers
commit0965537308ac3b267ea16e731bd73870a51c53b8
authorChris Mason <chris.mason@oracle.com>
Sat, 21 May 2011 13:27:38 +0000 (21 09:27 -0400)
committerChris Mason <chris.mason@oracle.com>
Sat, 21 May 2011 13:27:38 +0000 (21 09:27 -0400)
tree7b52288b7272b2391f736dd82a313cbbaad68570
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
parent82d5902d9c681be37ffa9d70482907f9f0b7ec1f
Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers

Conflicts:
fs/btrfs/free-space-cache.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/export.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/relocation.c
fs/btrfs/tree-log.c
fs/btrfs/xattr.c