review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c06a0e1 7a26285)

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	531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3
tree	63efdfe9b192243fefb76be3921b9a2aaa26291e	tree \| snapshot
parent	c06a0e120a4e381a1c291c1fce3c6155c5791cae	commit \| diff
parent	7a26285eea8eb92e0088db011571d887d4551b0f	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

Domain: System / Kernel;