git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b47b6e0 55e8552)

author	Chris Mason <chris.mason@oracle.com>
	Thu, 31 May 2012 20:50:28 +0000 (16:50 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Thu, 31 May 2012 20:49:53 +0000 (16:49 -0400)
commit	54cbbf63e8ad324e473e7de46095a361e10dac8b
tree	844ae54293c4414fc4c232a36d0e4d4939dc35aa	tree \| snapshot
parent	b47b6e0315133b1d30fa308a06028ada2b500934	commit \| diff
parent	55e8552649daddaf1bc455ee36915d2a8a1216e5	commit \| diff

Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
fs/btrfs/ulist.h

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	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/extent_io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ulist.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ulist.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.