Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jan 2008 01:15:23 +0000 (17:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jan 2008 01:15:23 +0000 (17:15 -0800)
commit50d9a126240f9961cfdd063336bbeb91f77a7dce
tree7e9c306cc49ad11e9e23cd4616591f323d9ff5cc
parent29bd17af7d8ffc16bb5eb286947495c166ea826e
parent946fef4e14ebc2f14ab05f54789843621fe87f60
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is m