]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 05:08:51 +0000 (15:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 05:08:51 +0000 (15:08 +1000)
commit91fe8ef75552399ff337bc9b58a0f589883b9643
tree38164c33e4f7fd9c3f13ec19d579ec2b541bb85f
parent44f196e880cf43b5aaf2622462e1ac4ee9d64412
parent7517e56d072e3f7ad567e7886981b023e2ff85ad
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-ux500/cpu-db8500.c
drivers/mtd/nand/Kconfig
drivers/usb/host/Kconfig
26 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/io.h
arch/arm/kernel/Makefile
arch/arm/mach-kirkwood/common.c
arch/arm/mach-tegra/pcie.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/powerpc/sysdev/fsl_msi.c
drivers/Makefile
drivers/gpio/gpio-pxa.c
drivers/i2c/busses/Kconfig
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/spi/spi-omap2-mcspi.c
drivers/tty/serial/mpc52xx_uart.c
drivers/usb/Kconfig
drivers/usb/host/Kconfig
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-nxp.c
include/linux/leds.h
include/linux/mod_devicetable.h