Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 3 Dec 2014 22:46:17 +0000 (09:46 +1100)
Conflicts:
fs/xfs/xfs_iops.c


Trivial merge