From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Jan 2008 01:15:23 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.25-rc1~1231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50d9a126240f9961cfdd063336bbeb91f77a7dce;p=thirdparty%2Fkernel%2Flinux.git

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
---

50d9a126240f9961cfdd063336bbeb91f77a7dce