summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 00:48:05 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-18 00:48:05 +0200
commitcd208bcc7cb0acd851e25c951ec2a9c14b084eab (patch)
tree1abe6430d4944a034ad677db58817a3e4aa9bac5 /CREDITS
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff)
parentcrypto: padlock - Revert aes-all alias to aes (diff)
downloadlinux-cd208bcc7cb0acd851e25c951ec2a9c14b084eab.tar.xz
linux-cd208bcc7cb0acd851e25c951ec2a9c14b084eab.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: padlock - Revert aes-all alias to aes crypto: api - Fix algorithm module auto-loading crypto: eseqiv - Fix IV generation for sync algorithms crypto: ixp4xx - check firmware for crypto support
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions