From: Linus Torvalds Date: Fri, 9 Oct 2009 20:30:14 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... X-Git-Tag: firefly_0821_release~12162 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4047df09a1581284218cb378208a87eaa36f2d2c;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./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 --- 4047df09a1581284218cb378208a87eaa36f2d2c