Merge branch 'xfs-generic-sb-counters' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 23 Feb 2015 23:27:28 +0000 (10:27 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 23 Feb 2015 23:27:28 +0000 (10:27 +1100)
Conflicts:
fs/xfs/xfs_super.c


Trivial merge