diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 00:59:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 00:59:10 +0200 |
| commit | 0bd3fbd4abeafa19ae0302d25194468b022d1a56 (patch) | |
| tree | 1fc34b25666c97b85dfb7199e48b2e074ffde264 /drivers/dma/at_hdmac_regs.h | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | crypto: aesni-intel - move more common code to ablk_init_common (diff) | |
| download | linux-0bd3fbd4abeafa19ae0302d25194468b022d1a56.tar.xz linux-0bd3fbd4abeafa19ae0302d25194468b022d1a56.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu:
- New cipher/hash driver for ARM ux500.
- Code clean-up for aesni-intel.
- Misc fixes.
Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite
frankly some of it made no sense at all (the pull brought in a
declaration for the dbx500_add_platform_device_noirq() function, which
neither exists nor is used anywhere).
Also some trivial add-add context conflicts in the Kconfig file in
drivers/{char/hw_random,crypto}/
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni-intel - move more common code to ablk_init_common
crypto: aesni-intel - use crypto_[un]register_algs
crypto: ux500 - Cleanup hardware identification
crypto: ux500 - Update DMA handling for 3.4
mach-ux500: crypto - core support for CRYP/HASH module.
crypto: ux500 - Add driver for HASH hardware
crypto: ux500 - Add driver for CRYP hardware
hwrng: Kconfig - modify default state for atmel-rng driver
hwrng: omap - use devm_request_and_ioremap
crypto: crypto4xx - move up err_request_irq label
crypto, xor: Sanitize checksumming function selection output
crypto: caam - add backward compatible string sec4.0
Diffstat (limited to 'drivers/dma/at_hdmac_regs.h')
0 files changed, 0 insertions, 0 deletions