]> git.karo-electronics.de Git - linux-beck.git/commit
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)
commit4225441a1eec45241efe529d23403d8ca3d1d71b
tree12ed2dead95f32531cccebf31d95d67280c6e361
parent3cabb836d801c3ad791c2dc6be07ec5819ab0a37
parent964aa8d9e4d36e0e54a88683d14c7d5b9d02aed8
Merge branch 'xfs-generic-sb-counters' into for-next

Conflicts:
fs/xfs/xfs_super.c
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/libxfs/xfs_ialloc.c
fs/xfs/libxfs/xfs_sb.c
fs/xfs/xfs_super.c