Merge branch 'heads/soc-cleanup-for-v4.1' into next

Conflicts:
	arch/arm/mach-shmobile/pm-sh7372.c

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

diff --cc arch/arm/mach-shmobile/common.h
index 8faf6e040d78b94adfc981ad8a614bd9693508e1,1dc09713f7532e3021e3de753716a2e511e1fe09..afc60bad6fd6b7d02093b6bf7d384ec4d7914cec
--- 1/arch/arm/mach-shmobile/common.h
--- 2/arch/arm/mach-shmobile/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@@ -21,9 -21,8 +21,7 @@@ extern void shmobile_smp_scu_cpu_die(un
  extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
  struct clk;
  extern int shmobile_clk_init(void);
 -extern void shmobile_handle_irq_intc(struct pt_regs *);
  extern struct platform_suspend_ops shmobile_suspend_ops;
- struct cpuidle_driver;
- extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
  
  #ifdef CONFIG_SUSPEND
  int shmobile_suspend_init(void);