diff options
| author | Linus Torvalds <[email protected]> | 2010-08-28 21:10:43 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-28 21:10:43 +0000 |
| commit | e933424c4823596ed231648eeb602b5209960ff6 (patch) | |
| tree | d1bec768605bd4cc91326b80a02fa6472384bf08 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra (diff) | |
| parent | eCryptfs: Fix encrypted file name lookup regression (diff) | |
| download | kernel-e933424c4823596ed231648eeb602b5209960ff6.tar.gz kernel-e933424c4823596ed231648eeb602b5209960ff6.zip | |
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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions