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: 698ab82 df3408d)

author	Chris Mason <chris.mason@oracle.com>
	Sun, 6 Nov 2011 08:05:08 +0000 (03:05 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Sun, 6 Nov 2011 08:05:08 +0000 (03:05 -0500)
commit	9e5762d5f338a707cf1536cc52163faeb93ed113
tree	63efdfe9b192243fefb76be3921b9a2aaa26291e	tree \| snapshot
parent	698ab824c788685903498e24b797c4de53ba8843	commit \| diff
parent	df3408d448e0691354fdd4144163902afe9930bf	commit \| diff

Merge branch 'for-chris' of git://github.com/sensille/linux into integration

Conflicts:
fs/btrfs/ctree.h

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

fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.