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
fs/xfs/xfs_iops.c

Simple merge
Simple merge