Merge branch 'xfs-bug-fixes-for-3.15-3' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 3 Apr 2014 21:07:35 +0000 (08:07 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 3 Apr 2014 21:07:35 +0000 (08:07 +1100)

Trivial merge