diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 13:30:14 -0700 |
| commit | 4047df09a1581284218cb378208a87eaa36f2d2c (patch) | |
| tree | 16e0f13b10d68f645b545a1c919714c66f75b863 /fs/efs/dir.c | |
| parent | a372bf8b6a12f23f68e716113ccaea4bf646dd0f (diff) | |
| parent | 36520be8e32b49bd85a63b7b8b40cd07c3da59a5 (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:
ima: ecryptfs fix imbalance message
eCryptfs: Remove Kconfig NET dependency and select MD5
ecryptfs: depends on CRYPTO
Diffstat (limited to 'fs/efs/dir.c')
0 files changed, 0 insertions, 0 deletions