| commit | 4047df09a1581284218cb378208a87eaa36f2d2c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 09 13:30:14 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 09 13:30:14 2009 -0700 |
| tree | 16e0f13b10d68f645b545a1c919714c66f75b863 | |
| 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