Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 22 Jun 2015 22:49:01 +0000 (08:49 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 22 Jun 2015 22:49:01 +0000 (08:49 +1000)

Trivial merge