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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9674a8e e149302)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 06:34:53 +0000 (16:34 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 20 Aug 2012 06:34:53 +0000 (16:34 +1000)
commit	ce8283ba485265655ed7f7e8f1c957fd0b2d993e
tree	266cb192950883074a1c5a6c60502c8aebb87106	tree \| snapshot
parent	9674a8e047633623188361abee2a38a40bf8e5b6	commit \| diff
parent	e149302b10b9437b0c0a66c442b46647779b1918	commit \| diff

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

Conflicts:
drivers/mtd/nand/Kconfig

18 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/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