projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f23d31 98efe8a)
Merge branch 'xfs-4.10-misc-fixes-1' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 9 Nov 2016 23:29:43 +0000 (10:29 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 9 Nov 2016 23:29:43 +0000 (10:29 +1100)
1  2 
fs/xfs/libxfs/xfs_bmap.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_aops.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge
diff --cc fs/xfs/xfs_aops.c
Simple merge
Domain: System / Kernel;