git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 05:12:57 +0000 (15:12 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 05:12:57 +0000 (15:12 +1000)
commit	b7afcdc91dce5b887ad593883b446f68ae9873c1
tree	b93e5fb4a021b99897255e6f8fd4da2c81831f60	tree \| snapshot
parent	32e50972c5e945c9849a517bff06792de57c158a	commit \| diff
parent	77f8e317b375949c5fba9126413385fd562f1ccd	commit \| diff

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-ux500/cpu-db8500.c
drivers/mtd/nand/Kconfig
drivers/usb/host/Kconfig

22 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_msi.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-pxa.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/bcm_umi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/mpc52xx_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
include/linux/leds.h	diff1 \|	diff2 \|	blob \| history
include/linux/mod_devicetable.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_msi.c	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-pxa.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/bcm_umi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/mpc52xx_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-nxp.c	diff1 \|	diff2 \|	blob \| history
include/linux/leds.h	diff1 \|	diff2 \|	blob \| history
include/linux/mod_devicetable.h	diff1 \|	diff2 \|	blob \| history