Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 01:36:59 +0000 (18:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 01:36:59 +0000 (18:36 -0700)
commit8397345172aa5cdcbc133977af9d525f45b874ea
tree9b1077a62bbe06d20f1e49d1aa842db0435be085
parent59c5f46fbe01a00eedf54a23789634438bb80603
parente6bc45d65df8599fdbae73be9cec4ceed274db53
Merge branch 'for-linus-2' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  vfs: make unlink() and rmdir() return ENOENT in preference to EROFS
  lmLogOpen() broken failure exit
  usb: remove bad dput after dentry_unhash
  more conservative S_NOSEC handling
fs/btrfs/super.c