]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/dt' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:10:52 +0000 (22:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:10:52 +0000 (22:10 +0200)
commit59f26c0311cb5b5959aa43f0092f705c83cb087b
tree6744067018a7028410049a2b4b6dab7839c0bfa4
parentb0240560dfecf32263fa2629e8b14661a709ca86
parent15f4b11b0fa91cf81738215483b2bb2c0b911285
Merge branch 'next/dt' into for-next

Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/mach-mxs/mach-mxs.c
27 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-mv78460.dtsi
arch/arm/boot/dts/armada-xp.dtsi
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/boot/dts/kirkwood-6282.dtsi
arch/arm/boot/dts/kirkwood-iconnect.dts
arch/arm/boot/dts/kirkwood-lsxl.dtsi
arch/arm/boot/dts/kirkwood-mplcec4.dts
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood-ts219-6281.dts
arch/arm/boot/dts/kirkwood-ts219-6282.dts
arch/arm/boot/dts/kirkwood-ts219.dtsi
arch/arm/boot/dts/kirkwood.dtsi
arch/arm/mach-at91/Kconfig.non_dt
arch/arm/mach-at91/Makefile
arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-nomadik/cpu-8815.c
arch/arm/mach-s3c24xx/Kconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/include/mach/r8a7740.h
arch/arm/mach-shmobile/setup-r8a7740.c
arch/arm/mach-zynq/common.c
drivers/bus/Kconfig
drivers/bus/Makefile