]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:08:02 +0000 (16:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:08:02 +0000 (16:08 +1000)
commitccfdca920e08786725be7ee09bb441953d1eb76b
treec8c003abe77b7e86f5f7742cf8414d9a0d3cda47
parentc6072dfc98d138fc2ce31be2b532aa01a49b0a34
parent31d0421ee39cad9eb7dd628ec9e87718ddd89246
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/phy/phy-rcar-usb.c
37 files changed:
MAINTAINERS
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/include/asm/cp15.h
arch/arm/mach-msm/io.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/clock-r8a7779.c
arch/arm/mm/mmu.c
arch/arm/plat-samsung/include/plat/cpu-freq-core.h
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Makefile
drivers/cpufreq/s3c24xx-cpufreq.c
drivers/crypto/ux500/cryp/cryp_core.c
drivers/gpio/Kconfig
drivers/gpio/gpio-rcar.c
drivers/pci/Kconfig
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/sh-pfc/core.c
drivers/regulator/ab8500.c
drivers/staging/tidspbridge/core/_tiomap.h
drivers/staging/tidspbridge/core/tiomap3430_pwr.c
drivers/tty/serial/xilinx_uartps.c
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-platform.c
drivers/usb/musb/ux500.c
drivers/usb/musb/ux500_dma.c
drivers/usb/phy/Kconfig
sound/soc/ux500/ux500_pcm.c