tree da1c16592dd1351d22d7904da0d532fd55a53817
parent 5f8fe4270e53d38421ba34c428c3b58933b48e50
parent 9c2d2056647790c5034d722bd24e9d913ebca73c
author Linus Torvalds <torvalds@linux-foundation.org> 1253837417 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253837417 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Prevent lower dentry from going negative during unlink
  eCryptfs: Propagate vfs_read and vfs_write return codes
  eCryptfs: Validate global auth tok keys
  eCryptfs: Filename encryption only supports password auth tokens
  eCryptfs: Check for O_RDONLY lower inodes when opening lower files
  eCryptfs: Handle unrecognized tag 3 cipher codes
  ecryptfs: improved dependency checking and reporting
  eCryptfs: Fix lockdep-reported AB-BA mutex issue
  ecryptfs: Remove unneeded locking that triggers lockdep false positives