Merge branches 'heads/soc-cleanup-for-v3.16' and 'heads/sh-drivers-for-v3.16' into...

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

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

diff --cc arch/arm/mach-shmobile/setup-r8a7791.c
index 9839daca32a32e8b74f0f27a96f7843c73019546,949580ae150ae47acbd04665af979b2dc15fdbd6,e28404e43860ac371a766dbf97c0f9f47902ec50..74a416e52fb98b6421cdfe9d34894a14022f9a1f
--- 1/arch/arm/mach-shmobile/setup-r8a7791.c
--- 2/arch/arm/mach-shmobile/setup-r8a7791.c
--- 3/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@@@ -207,13 -210,6 -210,13 +207,6 @@@@ void __init r8a7791_add_standard_device
        r8a7791_register_thermal();
   }
   
- -void __init r8a7791_init_early(void)
- -{
- -#ifndef CONFIG_ARM_ARCH_TIMER
-       shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
  -     shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
- -#endif
- -}
- -
   #ifdef CONFIG_USE_OF
   static const char *r8a7791_boards_compat_dt[] __initdata = {
        "renesas,r8a7791",