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>
	Wed, 5 Sep 2012 04:46:03 +0000 (14:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Sep 2012 04:46:03 +0000 (14:46 +1000)
commit	9ec82224a2761b046f2d45f60a1dd1f4c961dec6
tree	74a79c2fb436c299b137d91f196462ec33e9541b	tree \| snapshot
parent	ef31521f4b769df3341b17a9900058b88888a417	commit \| diff
parent	ce21a7ffe27d9b4523d2b1b8cb86b7313ecfb39b	commit \| diff

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

Conflicts:
drivers/mtd/nand/Kconfig

22 files changed:

arch/arm/Kconfig	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-bcmring/arch.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.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/leds/Kconfig	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
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/include/asm/io.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-bcmring/arch.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_eb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb1176.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pb11mp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pba8.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/realview_pbx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/pcie.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu-db8500.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/leds/Kconfig	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
include/linux/leds.h	diff1 \|	diff2 \|	blob \| history
include/linux/mod_devicetable.h	diff1 \|	diff2 \|	blob \| history