Merge branch 'xfs-dax-fixes-for-4.5' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 4 Jan 2016 21:08:47 +0000 (08:08 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 4 Jan 2016 21:08:47 +0000 (08:08 +1100)

Trivial merge