linux/arch/arm/mach-ux500/include/mach
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
..
crypto-ux500.h mach-ux500: crypto - core support for CRYP/HASH module. 2012-05-15 17:25:32 +10:00
db8500-regs.h ARM: ux500: core U9540 support 2012-05-02 00:25:13 +02:00
debug-macro.S ARM: ux500: delete U5500 support 2012-05-02 00:39:43 +02:00
devices.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-05-23 15:59:10 -07:00
gpio.h ARM: 7241/1: mach-ux500 Use CONFIG_ARCH_NR_GPIO 2011-12-23 22:54:51 +00:00
hardware.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-05-23 15:59:10 -07:00
id.h ARM: ux500: core U9540 support 2012-05-02 00:25:13 +02:00
irqs-board-mop500.h mfd: Support AB9540 ab8500 variant 2012-03-06 18:46:43 +01:00
irqs-db8500.h mach-ux500: update SoC and board IRQ handling 2011-05-24 22:11:45 +02:00
irqs.h Merge branch 'ux500/delete-u5500' into next/soc 2012-05-14 16:29:32 +02:00
msp.h ARM: ux500: Add support for MSP I2S-devices 2012-04-24 10:26:47 +02:00
setup.h ARM: ux500: delete U5500 support 2012-05-02 00:39:43 +02:00
timex.h ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
uncompress.h ARM: ux500: delete U5500 support 2012-05-02 00:39:43 +02:00
usb.h ARM: ux500: pass parent pointer to each platform device 2012-02-13 06:31:29 +00:00