Merge branch 'xfs-dax-support' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:01:49 +0000 (13:01 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:01:49 +0000 (13:01 +1000)

Trivial merge