From: Paul Mundt Date: Mon, 9 Jan 2012 00:56:37 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... X-Git-Tag: v3.3-rc1~90^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04cf399640b7acfa9abe2eb7900cd934db8af697;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest Conflicts: arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt --- 04cf399640b7acfa9abe2eb7900cd934db8af697 diff --cc arch/arm/mach-shmobile/Makefile index 5ee604dcaf57a,5ca1f9d669953..83e35f254bff1 --- a/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