Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
commit15e551e52bf62f595f06ddf7a66b750ccfe41683
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:28:54 +0000 (21 07:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:28:54 +0000 (21 07:28 -0800)
treec8364383eca64ad2e66a44d897fe16f0f40cb926
parent30a0f5e1fb510f17c25ff159a9fffbe01ae0f34e
parentece550f51ba175c14ec3ec047815927d7386ea1f
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: use after free
  ecryptfs: Eliminate useless code
  ecryptfs: fix interpose/interpolate typos in comments
  ecryptfs: pass matching flags to interpose as defined and used there
  ecryptfs: remove unnecessary d_drop calls in ecryptfs_link
  ecryptfs: don't ignore return value from lock_rename
  ecryptfs: initialize private persistent file before dereferencing pointer
  eCryptfs: Remove mmap from directory operations
  eCryptfs: Add getattr function
  eCryptfs: Use notify_change for truncating lower inodes