Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:46:03 +0000 (15:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Feb 2008 23:46:03 +0000 (15:46 -0800)
commit0eddf038adc8dff78efe86b71284e3f52b7cef27
tree0b1521e7117b36f315ad1c4d9a4a3175da80cfd8
parent86b7cbc9d3f7b357dbd4f22779c5df375eb76c46
parentc8620c2590f43eff864fe597fcbe5b72ab7a7b94
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