| commit | 26b55633a891a28bf04f42882de145eb8e9cb9ad | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 10 12:14:39 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 10 12:14:39 2010 -0700 |
| tree | 997c1bbaad576a0ae4903af59a8d89b86b0f2fae | |
| parent | b34d8915c413acb51d837a45fb8747b61f65c020 [diff] | |
| parent | 21edad32205e97dc7ccb81a85234c77e760364c8 [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: dont call lookup_one_len to avoid NULL nameidata fs/ecryptfs/file.c: introduce missing free ecryptfs: release reference to lower mount if interpose fails eCryptfs: Handle ioctl calls with unlocked and compat functions ecryptfs: Fix warning in ecryptfs_process_response()