Merge branch 'xfs-misc-fixes-for-3.20-1' into for-next
authorDave Chinner <david@fromorbit.com>
Tue, 23 Dec 2014 22:49:53 +0000 (09:49 +1100)
committerDave Chinner <david@fromorbit.com>
Tue, 23 Dec 2014 22:49:53 +0000 (09:49 +1100)

Trivial merge