diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 19:22:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 19:22:10 +0200 |
commit | eed631e0d741d1a1067cfc6d709fdf2363126f9c (patch) | |
tree | 31ba02472a8d5ef2d7780274a7663258c09a9acf /fs/xfs/linux-2.6/xfs_super.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
parent | Btrfs: fix FS_IOC_SETFLAGS ioctl (diff) | |
download | linux-eed631e0d741d1a1067cfc6d709fdf2363126f9c.tar.xz linux-eed631e0d741d1a1067cfc6d709fdf2363126f9c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix FS_IOC_SETFLAGS ioctl
Btrfs: fix FS_IOC_GETFLAGS ioctl
fs: remove FS_COW_FL
Btrfs: fix easily get into ENOSPC in mixed case
Prevent oopsing in posix_acl_valid()
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
0 files changed, 0 insertions, 0 deletions