| commit | e933424c4823596ed231648eeb602b5209960ff6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:10:43 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:10:43 2010 -0700 |
| tree | d1bec768605bd4cc91326b80a02fa6472384bf08 | |
| parent | 8f2a0029b8aaed9fb37d775dbe527e163920b129 [diff] | |
| parent | 93c3fe40c279f002906ad14584c30671097d4394 [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: Fix encrypted file name lookup regression ecryptfs: properly mark init functions fs/ecryptfs: Return -ENOMEM on memory allocation failure