tree 31ba02472a8d5ef2d7780274a7663258c09a9acf
parent bd1a643e10eb8782b36b47c3602300319dd2fb00
parent ebcb904dfe31644857422e3bb62e50f76fe86255
author Linus Torvalds <torvalds@linux-foundation.org> 1305480130 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305480130 -0700

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()