projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b28cf57 8cdc7c5)
Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanan...
authorChris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
committerChris Mason <clm@fb.com>
Mon, 11 Jan 2016 16:39:28 +0000 (08:39 -0800)
Signed-off-by: Chris Mason <clm@fb.com>
1  2 
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history
fs/btrfs/inode.c patch | diff1 | diff2 | blob | history
fs/btrfs/volumes.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/extent-tree.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge