Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 21:15:12 +0000 (14:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 21:15:12 +0000 (14:15 -0700)
commit12462f2df4d10ea4f6d55b9d438ff788badec3f0
tree7ef2335c9df9b9cb45aa64c9dfcf8819bdcdf06f
parentd2df40857fd57f02906e6ac1484d10cb7accbc86
parent8747f954817212b4623f9067d4909cbde04b4d89
Merge branch 'for-linus' of git://git./linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Print mount_auth_tok_only param in ecryptfs_show_options
  ecryptfs: added ecryptfs_mount_auth_tok_only mount parameter
  ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig()
  ecryptfs: release keys loaded in ecryptfs_keyring_auth_tok_for_sig()
  eCryptfs: Clear LOOKUP_OPEN flag when creating lower file
  ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
fs/ecryptfs/ecryptfs_kernel.h
fs/ecryptfs/main.c