summaryrefslogtreecommitdiffstats
path: root/fs/libfs.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-02-24 00:27:28 +0100
committerDave Chinner <david@fromorbit.com>2015-02-24 00:27:28 +0100
commit4225441a1eec45241efe529d23403d8ca3d1d71b (patch)
tree12ed2dead95f32531cccebf31d95d67280c6e361 /fs/libfs.c
parentMerge branch 'xfs-misc-fixes-for-4.1' into for-next (diff)
parentxfs: remove xfs_mod_incore_sb API (diff)
downloadlinux-4225441a1eec45241efe529d23403d8ca3d1d71b.tar.xz
linux-4225441a1eec45241efe529d23403d8ca3d1d71b.zip
Merge branch 'xfs-generic-sb-counters' into for-next
Conflicts: fs/xfs/xfs_super.c
Diffstat (limited to 'fs/libfs.c')
0 files changed, 0 insertions, 0 deletions