| commit | 3b71710f081e90f9682a65d479cf8ae038d74213 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 21 17:25:00 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 21 17:25:00 2011 -0800 |
| tree | 88b152f9ae06a08e72ae590d447c1b7c43af68fc | |
| parent | 951f3512dba5bd44cda3e5ee22b4b522e4bb09fb [diff] | |
| parent | 55f9cf6bbaa682958a7dd2755f883b768270c3ce [diff] |
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"