projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd1a643 ebcb904)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 May 2011 17:22:10 +0000 (10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 May 2011 17:22:10 +0000 (10:22 -0700)
commiteed631e0d741d1a1067cfc6d709fdf2363126f9c
tree31ba02472a8d5ef2d7780274a7663258c09a9acftree | snapshot
parentbd1a643e10eb8782b36b47c3602300319dd2fb00commit | diff
parentebcb904dfe31644857422e3bb62e50f76fe86255commit | diff
Merge git://git./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()
fs/btrfs/acl.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
John Crispins staging tree