Merge branch 'dt2' into cleanup3-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000 (18:06 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 6 Aug 2013 09:06:53 +0000 (18:06 +0900)
commit4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793
tree3932656b422e63e3d3fc4629a57a1a8b7f03ef42
parent98724b7ec9d34d875fc193660c87d6dd0d17ceb7
parent8b3e32c1fe5dce55e28e76b20361841dc863ec17
Merge branch 'dt2' into cleanup3-base

Conflicts:
arch/arm/mach-shmobile/Makefile.boot
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/Makefile.boot
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-marzen.c
arch/arm/mach-shmobile/include/mach/r8a7779.h
arch/arm/mach-shmobile/intc-r8a7779.c
arch/arm/mach-shmobile/setup-r8a73a4.c