Merge branch 'xfs-sb-logging-rework' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 21 Jan 2015 22:20:53 +0000 (09:20 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 21 Jan 2015 22:20:53 +0000 (09:20 +1100)
Conflicts:
fs/xfs/xfs_mount.c


Trivial merge