lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
0bd3fbd4ab
linux-kernel-test/arch/arm
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
..
boot Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
common arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
configs Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-22 18:18:55 -07:00
include/asm Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-23 10:59:07 -07:00
kernel Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-22 18:18:55 -07:00
lib ARM: Remove support for ARMv3 ARM610 and ARM710 CPUs 2012-05-05 05:50:50 +01:00
mach-at91 Staging tree pull request for 3.5-rc1 2012-05-22 16:34:21 -07:00
mach-bcmring ARM: bcmring: fix UART declarations 2012-04-18 21:21:45 -07:00
mach-clps711x ARM: clps711x: Cleanup IRQ handling 2012-05-15 21:20:59 +02:00
mach-cns3xxx ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-davinci arm: davinci: use for_each_set_bit_from 2012-05-09 17:22:07 +05:30
mach-dove arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
mach-ebsa110
mach-ep93xx
mach-exynos USB 3.5-rc1 pull request 2012-05-22 15:50:46 -07:00
mach-footbridge ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-gemini
mach-h720x
mach-highbank
mach-imx Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
mach-integrator Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-iop13xx ARM: PCI: get rid of pci_std_swizzle() 2012-05-13 17:12:16 +01:00
mach-iop32x ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-iop33x ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-ixp4xx Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-05-21 16:01:50 -07:00
mach-kirkwood arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-ks8695 ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-l7200/include/mach
mach-lpc32xx ARM: LPC32xx: Move common code to common.c 2012-04-22 12:01:19 +02:00
mach-mmp arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-msm Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup 2012-05-11 22:31:02 -07:00
mach-mv78xx0 ARM: PCI: dove/kirkwood/mv78xx0: use sys->private_data 2012-05-16 15:24:11 +01:00
mach-mxs arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
mach-netx
mach-nomadik ARM: nomadik: enable PINCTRL_NOMADIK where needed 2012-05-15 14:42:57 +02:00
mach-omap1 arm-soc: non-critical bug fixes 2012-05-22 09:27:39 -07:00
mach-omap2 TTY pull request for 3.5-rc1 2012-05-22 16:12:24 -07:00
mach-orion5x arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-picoxcell
mach-pnx4008 i2c-pnx.c: Remove duplicated i2c.h 2012-04-22 11:59:47 +02:00
mach-prima2 ARM: PRIMA2: fix irq domain size and IRQ mask of internal interrupt controller 2012-05-16 21:52:13 -07:00
mach-pxa arm-soc: board specific changes 2012-05-22 13:32:53 -07:00
mach-realview
mach-rpc
mach-s3c24xx ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c 2012-05-13 06:47:18 +09:00
mach-s3c64xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-05-22 19:22:50 -07:00
mach-s3c2410
mach-s3c2412
mach-s3c2440
mach-s5p64x0 ARM: S5P64X0: Use common macro to define resources on dev-audio.c 2012-05-12 16:12:30 +09:00
mach-s5pc100 ARM: S5PC100: Use common macro to define resources on dev-audio.c 2012-05-12 16:12:30 +09:00
mach-s5pv210 USB 3.5-rc1 pull request 2012-05-22 15:50:46 -07:00
mach-sa1100 Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-shark ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
mach-shmobile Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
mach-spear3xx arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
mach-spear6xx arm-soc: device tree conversions, part 1 2012-05-22 09:30:52 -07:00
mach-tegra Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
mach-u300 ARM: u300: bump all IRQ numbers by one 2012-04-20 09:52:58 +02:00
mach-ux500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-05-23 15:59:10 -07:00
mach-versatile Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus 2012-05-21 15:15:10 +01:00
mach-vexpress ARM: vexpress: plug local timers into the DT code 2012-04-27 13:39:01 +01:00
mach-vt8500
mach-w90x900
mach-zynq
mm arm-soc: power management changes 2012-05-22 09:41:01 -07:00
net
nwfpe
oprofile
plat-iop ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
plat-mxc ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN 2012-05-02 10:28:36 +02:00
plat-nomadik ARM: nomadik: enable PINCTRL_NOMADIK where needed 2012-05-15 14:42:57 +02:00
plat-omap TTY pull request for 3.5-rc1 2012-05-22 16:12:24 -07:00
plat-orion orion/kirkwood: create a generic function for gpio led blinking 2012-05-15 03:12:14 +00:00
plat-pxa
plat-s3c24xx
plat-s5p
plat-samsung USB 3.5-rc1 pull request 2012-05-22 15:50:46 -07:00
plat-spear arm-soc: soc-specific pinctrl changes 2012-05-22 09:39:42 -07:00
plat-versatile ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller 2012-05-04 16:53:37 +01:00
tools ARM: Update mach-types 2012-04-26 08:46:02 +01:00
vfp Merge branch 'misc' into for-linus 2012-05-21 15:15:24 +01:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-05-22 19:22:50 -07:00
Kconfig-nommu
Kconfig.debug
Makefile arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00