]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 20:30:14 +0000 (13:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 20:30:14 +0000 (13:30 -0700)
commit4047df09a1581284218cb378208a87eaa36f2d2c
tree16e0f13b10d68f645b545a1c919714c66f75b863
parenta372bf8b6a12f23f68e716113ccaea4bf646dd0f
parent36520be8e32b49bd85a63b7b8b40cd07c3da59a5
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