git » linux-kernel » commit 4047df0

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

author Linus Torvalds
2009-10-09 20:30:14 UTC
committer Linus Torvalds
2009-10-09 20:30:14 UTC
parent a372bf8b6a12f23f68e716113ccaea4bf646dd0f
parent 36520be8e32b49bd85a63b7b8b40cd07c3da59a5
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