tree 81a61647a9c3f98acdae1e93e22d6628f76a4042
parent 198aa045601d20f39658c892dc626e16993bae78
parent 3a6b42cadc112b01daf0525e5fcd90bb333a5bb3
author Linus Torvalds <torvalds@linux-foundation.org> 1240587164 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240587164 -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: Larger buffer for encrypted symlink targets
  eCryptfs: Lock lower directory inode mutex during lookup
  eCryptfs: Remove ecryptfs_unlink_sigs warnings
  eCryptfs: Fix data corruption when using ecryptfs_passthrough
  eCryptfs: Print FNEK sig properly in /proc/mounts
  eCryptfs: NULL pointer dereference in ecryptfs_send_miscdev()
  eCryptfs: Copy lower inode attrs before dentry instantiation