Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:31:13 +0000 (13:31 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 4 Jun 2015 03:31:13 +0000 (13:31 +1000)

Trivial merge