Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 01:25:00 +0000 (17:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 01:25:00 +0000 (17:25 -0800)
commit3b71710f081e90f9682a65d479cf8ae038d74213
tree88b152f9ae06a08e72ae590d447c1b7c43af68fc
parent951f3512dba5bd44cda3e5ee22b4b522e4bb09fb
parent55f9cf6bbaa682958a7dd2755f883b768270c3ce
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: Copy up lower inode attrs in getattr
  ecryptfs: read on a directory should return EISDIR if not supported
  eCryptfs: Handle NULL nameidata pointers
  eCryptfs: Revert "dont call lookup_one_len to avoid NULL nameidata"