projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d93ec0 6448543)
Merge branch 'xfs-dax-fixes-4.6' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:34:31 +0000 (09:34 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 6 Mar 2016 22:34:31 +0000 (09:34 +1100)
1  2 
fs/xfs/xfs_ioctl.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_iops.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_ioctl.c
Simple merge
diff --cc fs/xfs/xfs_iops.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git