]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 04:33:20 +0000 (14:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 04:33:20 +0000 (14:33 +1000)
commitb8691bcb0729b9feb37a2b5e20ea8ae0797b3c3e
tree22061d9599c05582c27688b819c720e1029e7330
parentbedefee261b5b1334754a691a8671f27c96bf862
parent37a6e724c997278dba9644e4979635388d9bd615
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/x86/include/asm/Kbuild
19 files changed:
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-imx/Kconfig
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/display.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-pxa/sharpsl_pm.c
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/powerpc/include/asm/Kbuild
arch/sparc/include/asm/Kbuild
arch/x86/include/asm/Kbuild
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/mmc/host/sdhci-tegra.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/spi/spi-omap2-mcspi.c