projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b036b97 3fd129b)
Merge branch 'xfs-4.9-reflink-prep' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:52:31 +0000 (09:52 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:52:31 +0000 (09:52 +1100)
1  2 
fs/xfs/xfs_mount.h patch | diff1 | diff2 | blob | history
fs/xfs/xfs_trans.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_mount.h
Simple merge
diff --cc fs/xfs/xfs_trans.c
Simple merge