Merge branch 'dt2' into cleanup3-base

Conflicts:
	arch/arm/mach-shmobile/Makefile.boot

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
index e3f8592fab88464ebce8266f4395fdf850fd5226,e401c737fb4ddd3b290c6dafa369778b8eb2fb87..f6881f9b7d5f7bd462d1c651757f189b9c14c5a0
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -27,15 -28,20 +27,17 @@@ obj-$(CONFIG_ARCH_SH7372)  += entry-intc
  # PM objects
  obj-$(CONFIG_SUSPEND)         += suspend.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
 -obj-$(CONFIG_ARCH_SHMOBILE)   += pm-rmobile.o
 -obj-$(CONFIG_ARCH_SH7372)     += pm-sh7372.o sleep-sh7372.o
 -obj-$(CONFIG_ARCH_R8A7740)    += pm-r8a7740.o
 -obj-$(CONFIG_ARCH_R8A7779)    += pm-r8a7779.o
 +obj-$(CONFIG_ARCH_SH7372)     += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
  obj-$(CONFIG_ARCH_SH73A0)     += pm-sh73a0.o
 +obj-$(CONFIG_ARCH_R8A7740)    += pm-r8a7740.o pm-rmobile.o
 +obj-$(CONFIG_ARCH_R8A7779)    += pm-r8a7779.o
  
  # Board objects
 -obj-$(CONFIG_MACH_AG5EVM)     += board-ag5evm.o
  obj-$(CONFIG_MACH_APE6EVM)    += board-ape6evm.o
+ obj-$(CONFIG_MACH_APE6EVM_REFERENCE)  += board-ape6evm-reference.o
  obj-$(CONFIG_MACH_MACKEREL)   += board-mackerel.o
 -obj-$(CONFIG_MACH_KOTA2)      += board-kota2.o
  obj-$(CONFIG_MACH_BOCKW)      += board-bockw.o
+ obj-$(CONFIG_MACH_BOCKW_REFERENCE)    += board-bockw-reference.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o
  obj-$(CONFIG_MACH_MARZEN_REFERENCE)   += board-marzen-reference.o
  obj-$(CONFIG_MACH_LAGER)      += board-lager.o

diff --cc arch/arm/mach-shmobile/Makefile.boot
index b8c1a21fcaf3da5045e0b60cba75063abee8964c,9c9b4412c60b3bcc8ace5a26ab3bc4fb5c5e57b1..6a504fe7d86c45cb1c9c43a746bfe5beecfca7bb
--- 1/arch/arm/mach-shmobile/Makefile.boot
--- 2/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@@ -1,9 -1,13 +1,11 @@@
  # per-board load address for uImage
  loadaddr-y    :=
 -loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000
  loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
+ loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
  loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
  loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
  loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 -loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000
+ loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
  loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
  loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
  loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/r8a7779.h
Simple merge

diff --cc arch/arm/mach-shmobile/intc-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a73a4.c
Simple merge