]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e7c1f2 c4220a8)
Merge branch 'for-chris' of
authorChris Mason <chris.mason@oracle.com>
Sat, 28 May 2011 11:00:39 +0000 (07:00 -0400)
committerChris Mason <chris.mason@oracle.com>
Sat, 28 May 2011 11:00:39 +0000 (07:00 -0400)
commit3c87a54bcfcadaf4a27c704a93c2b5ac37653bd1
tree17ee34b9b5e00804df4059503f82f6f1d94383a9tree | snapshot
parent4e7c1f2d8a5a85bb5abff56dcb0a164fc735d281commit | diff
parentc4220a878ce4da4ee20f8c01415909a322907b04commit | diff
Merge branch 'for-chris' of
git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work into for-linus

Conflicts:
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
15 files changed:
fs/btrfs/btrfs_inode.h diff1 | diff2 | blob | history
fs/btrfs/ctree.c diff1 | diff2 | blob | history
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/delayed-inode.c diff1 | | 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.c diff1 | diff2 | blob | history
fs/btrfs/free-space-cache.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/btrfs/relocation.c diff1 | diff2 | blob | history
fs/btrfs/transaction.c diff1 | diff2 | blob | history
fs/btrfs/transaction.h diff1 | diff2 | blob | history
fs/btrfs/xattr.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.