git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cb83b7b 5d3edd8)

author	Chris Mason <clm@fb.com>
	Wed, 3 Dec 2014 02:42:03 +0000 (18:42 -0800)
committer	Chris Mason <clm@fb.com>
	Wed, 3 Dec 2014 02:42:03 +0000 (18:42 -0800)
commit	9627aeee3e203e30679549e4962633698a6bf87f
tree	30ee313a7049bf3fcc17e346df5737e967fd9a95	tree \| snapshot (tar.gz zip)
parent	cb83b7b81698a4abe531e0ba18b9e288b06947ce	commit \| diff
parent	5d3edd8f44aac94de7b16f4c54290e24f5e8c532	commit \| diff

Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus

fs/btrfs/ctree.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/dev-replace.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/scrub.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.h	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi