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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cd5620f 6486a93)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 06:14:58 +0000 (16:14 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 06:14:58 +0000 (16:14 +1000)
commit	40eae70814e2bfc54cfc6737b3ef8c1267c86bfe
tree	b9bc66ca2a606ecb7f2ddd9aab5c5442987a02f5	tree \| snapshot
parent	cd5620f191e932b6de9eeb7445d5ed0625181395	commit \| diff
parent	6486a93d175e635cda285019b1b6dab92e7ca924	commit \| diff

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

Conflicts:
drivers/mtd/nand/Kconfig

19 files changed:

arch/arm/Kconfig	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-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/twl-common.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-ux500/cpu-db8500.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/fsl_msi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-pxa.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/i2c-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/omap_hsmmc.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

Linux kernel for KaRo TX COM modules