Merge branch 'xfs-sparse-inode' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 1 Jun 2015 00:51:38 +0000 (10:51 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 1 Jun 2015 00:51:38 +0000 (10:51 +1000)

Trivial merge