Merge branch 'xfs-misc-fixes-for-3.20-2' into for-next
authorDave Chinner <david@fromorbit.com>
Fri, 9 Jan 2015 00:06:17 +0000 (11:06 +1100)
committerDave Chinner <david@fromorbit.com>
Fri, 9 Jan 2015 00:06:17 +0000 (11:06 +1100)

Trivial merge