Merge branch 'xfs-generic-sb-counters' into for-next

Conflicts:
	fs/xfs/xfs_super.c
This commit is contained in:
Dave Chinner 2015-02-24 10:27:28 +11:00
commit 4225441a1e
13 changed files with 381 additions and 1129 deletions