Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)

Trivial merge