Merge branch 'xfs-mmap-lock' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 23 Feb 2015 23:27:47 +0000 (10:27 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 23 Feb 2015 23:27:47 +0000 (10:27 +1100)

Trivial merge