projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15c03dd 1357272)
Merge branch 'for-linus' into for-linus-3.12
authorChris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
committerChris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
1  2 
fs/btrfs/dev-replace.c patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/dev-replace.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge