diff options
| author | Dave Chinner <[email protected]> | 2015-02-23 23:27:28 +0000 |
|---|---|---|
| committer | Dave Chinner <[email protected]> | 2015-02-23 23:27:28 +0000 |
| commit | 4225441a1eec45241efe529d23403d8ca3d1d71b (patch) | |
| tree | 12ed2dead95f32531cccebf31d95d67280c6e361 /fs/xfs/xfs_inode.c | |
| parent | Merge branch 'xfs-misc-fixes-for-4.1' into for-next (diff) | |
| parent | xfs: remove xfs_mod_incore_sb API (diff) | |
| download | kernel-4225441a1eec45241efe529d23403d8ca3d1d71b.tar.gz kernel-4225441a1eec45241efe529d23403d8ca3d1d71b.zip | |
Merge branch 'xfs-generic-sb-counters' into for-next
Conflicts:
fs/xfs/xfs_super.c
Diffstat (limited to 'fs/xfs/xfs_inode.c')
0 files changed, 0 insertions, 0 deletions