]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:10:28 +0000 (22:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:10:28 +0000 (22:10 +0200)
commitb0240560dfecf32263fa2629e8b14661a709ca86
tree5a8525997b9619f9e05f2638337dff91159f9402
parent57446b98fb13e1ddf6cafef2bf7da2b60f178733
parentb31a76546c08f618e355bd12a7cc138c045374b7
Merge branch 'next/boards' into for-next

Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/board-marzen.c
arch/arm/mach-shmobile/setup-r8a7778.c
arch/arm/boot/dts/kirkwood-ts219.dtsi
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/Makefile
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/common.h
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/board-marzen.c