Merge branch 'fs-4.8-iomap-infrastructure' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:19 +0000 (10:10 +1000)
committerDave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:19 +0000 (10:10 +1000)

Trivial merge