Merge branch 'xfs-misc-fixes-for-4.2' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 1 Jun 2015 00:50:18 +0000 (10:50 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 1 Jun 2015 00:50:18 +0000 (10:50 +1000)

Trivial merge