summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-01-26 02:15:23 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-01-26 02:15:23 +0100
commit50d9a126240f9961cfdd063336bbeb91f77a7dce (patch)
tree7e9c306cc49ad11e9e23cd4616591f323d9ff5cc /drivers/ieee1394
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parent[CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is m (diff)
downloadlinux-50d9a126240f9961cfdd063336bbeb91f77a7dce.tar.xz
linux-50d9a126240f9961cfdd063336bbeb91f77a7dce.zip
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
Diffstat (limited to 'drivers/ieee1394')
0 files changed, 0 insertions, 0 deletions