]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ino-alloc' of git://repo.or.cz/linux-btrfs-devel into inode_numbers
authorChris Mason <chris.mason@oracle.com>
Sat, 21 May 2011 13:27:38 +0000 (09:27 -0400)
committerChris Mason <chris.mason@oracle.com>
Sat, 21 May 2011 13:27:38 +0000 (09:27 -0400)
commite752fd51b45e5504bbe3949f9f3dd789612797dd
tree7b52288b7272b2391f736dd82a313cbbaad68570
parent5720d480f250a80350663e6b19ef7e83d71738be
parenta30e65f56f8bd6c1fd0eb27cc9439dc89b0b8244
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