q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/char/hw_random
History
Linus Torvalds 0bd3fbd4ab 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
 		2012-05-23 15:59:10 -07:00
..
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-05-23 15:59:10 -07:00
Makefile powerpc/pseries/hwrng: PFO-based hwrng driver 2012-05-14 10:49:12 +10:00
amd-rng.c hwrng: amd - manage resource allocation 2011-05-04 15:13:15 +10:00
atmel-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
core.c Update my e-mail address 2011-07-07 15:18:01 +02:00
geode-rng.c hwrng: Use PCI_VDEVICE 2009-06-25 13:50:53 +08:00
intel-rng.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx-rng.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
mxc-rnga.c i.MX31: Add hw-random for RNGA 2009-05-07 16:17:16 +02:00
n2-asm.S sparc64: Add Niagara2 RNG driver. 2008-07-18 00:46:09 -07:00
n2-drv.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
n2rng.h n2rng: Attach on Niagara-T3. 2011-07-28 01:26:30 -07:00
nomadik-rng.c ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver 2012-03-16 23:32:35 +00:00
octeon-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
omap-rng.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-05-15 17:21:26 +10:00
pasemi-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
picoxcell-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
ppc4xx-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
pseries-rng.c powerpc/pseries/hwrng: PFO-based hwrng driver 2012-05-14 10:49:12 +10:00
timeriomem-rng.c char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver() 2011-11-30 16:12:47 +08:00
tx4939-rng.c hwrng: tx4939 - use devm_request_and_ioremap 2012-01-13 16:38:40 +11:00
via-rng.c hwrng: via_rng - Fix memory scribbling on some CPUs 2011-01-07 14:55:06 +11:00
virtio-rng.c virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf 2012-01-12 15:44:42 +10:30