projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf60920 3e4c5ef)
Merge branch 'dev/fst-followup' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorChris Mason <clm@fb.com>
Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
committerChris Mason <clm@fb.com>
Wed, 27 Jan 2016 13:48:23 +0000 (05:48 -0800)
1  2 
fs/btrfs/disk-io.c patch | diff1 | diff2 | blob | history
fs/btrfs/free-space-tree.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/free-space-tree.c
Simple merge