From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 18 Feb 2008 23:46:03 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.25-rc3~134
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0eddf038adc8dff78efe86b71284e3f52b7cef27;p=platform%2Fkernel%2Flinux-3.10.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER
  [CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER
  [HIFN]: Fix invalid config ifdefs for RNG support
---

0eddf038adc8dff78efe86b71284e3f52b7cef27