From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Feb 2011 01:25:00 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... 
X-Git-Tag: v2.6.38-rc6~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3b71710f081e90f9682a65d479cf8ae038d74213;p=~shefty%2Frdma-dev.git

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: 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"
---

3b71710f081e90f9682a65d479cf8ae038d74213