projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4922be5 7d6a13f)
Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 11 Jan 2016 20:04:30 +0000 (07:04 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 11 Jan 2016 20:04:30 +0000 (07:04 +1100)
1  2 
fs/xfs/xfs_iomap.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_log_recover.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_iomap.c
Simple merge
diff --cc fs/xfs/xfs_log_recover.c
Simple merge