Merge branch 'iomap-4.9-dax' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:53:59 +0000 (09:53 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 2 Oct 2016 22:53:59 +0000 (09:53 +1100)
commita1f45e668e14c26b4700b1936c5a41b58cc4ac74
tree94c1d2b34c15fff8ff39baf7357673978b5a3b2f
parenta89b3f97bb7c248aea155a90f31d3dfb93b75971
parentd5bfccdf38d094f2b15fae8b361d7bd47f2509d6
Merge branch 'iomap-4.9-dax' into for-next
fs/iomap.c
fs/xfs/xfs_file.c
include/linux/iomap.h