Merge branch 'xfs-misc-fixes-3.17-2' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 4 Aug 2014 03:55:27 +0000 (13:55 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 4 Aug 2014 03:55:27 +0000 (13:55 +1000)

Trivial merge