Merge git://git.kernel.org/pub/scm/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
This commit is contained in:
Linus Torvalds 2008-01-25 17:15:23 -08:00
commit 50d9a12624
2 changed files with 10 additions and 4 deletions