Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/arm/mach-shmobile/Makefile
index 5ee604d,5ca1f9d..83e35f2
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -30,8 -28,6 +30,7 @@@ pfc-$(CONFIG_ARCH_R8A7740)    += pfc-r8a77
  obj-$(CONFIG_ARCH_SH7367)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7377)     += entry-intc.o
  obj-$(CONFIG_ARCH_SH7372)     += entry-intc.o
- obj-$(CONFIG_ARCH_SH73A0)     += entry-gic.o
 +obj-$(CONFIG_ARCH_R8A7740)    += entry-intc.o
  
  # PM objects
  obj-$(CONFIG_SUSPEND)         += suspend.o

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