diff for duplicates of <20120511194220.6567.56443.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 96453ce..28254db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o # Pinmux setup - pfc-y :--- 0008/arch/arm/mach-shmobile/board-kzm9d.c + pfc-y := +--- 0008/arch/arm/mach-shmobile/board-kzm9d.c +++ work/arch/arm/mach-shmobile/board-kzm9d.c 2012-05-12 03:23:09.000000000 +0900 @@ -27,6 +27,7 @@ #include <asm/hardware/gic.h> diff --git a/a/content_digest b/N1/content_digest index f87c8f1..3fead34 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120511194151.6567.53888.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/06] mach-shmobile: Emma Mobile EV2 SMP support V2\0" - "Date\0Fri, 11 May 2012 19:42:20 +0000\0" + "Date\0Sat, 12 May 2012 04:42:20 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -47,7 +47,8 @@ "+smp-$(CONFIG_ARCH_EMEV2)\t+= smp-emev2.o\n" " \n" " # Pinmux setup\n" - " pfc-y\t\t\t\t:--- 0008/arch/arm/mach-shmobile/board-kzm9d.c\n" + " pfc-y\t\t\t\t:=\n" + "--- 0008/arch/arm/mach-shmobile/board-kzm9d.c\n" "+++ work/arch/arm/mach-shmobile/board-kzm9d.c\t2012-05-12 03:23:09.000000000 +0900\n" "@@ -27,6 +27,7 @@\n" " #include <asm/hardware/gic.h>\n" @@ -315,4 +316,4 @@ "+\tmodify_scu_cpu_psr(0, 3 << (cpu * 8));\n" +} -a61d4a7d853ba35c829921c7695b68bb51c03e6271302d09395ccd20298b002d +b7f5d0096e930da2293ae721d94db6a62af21084fc0032a0e61f1f57d167682f
diff --git a/a/1.txt b/N2/1.txt index 96453ce..28254db 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -40,7 +40,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o # Pinmux setup - pfc-y :--- 0008/arch/arm/mach-shmobile/board-kzm9d.c + pfc-y := +--- 0008/arch/arm/mach-shmobile/board-kzm9d.c +++ work/arch/arm/mach-shmobile/board-kzm9d.c 2012-05-12 03:23:09.000000000 +0900 @@ -27,6 +27,7 @@ #include <asm/hardware/gic.h> diff --git a/a/content_digest b/N2/content_digest index f87c8f1..3b96d38 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,17 @@ "ref\020120511194151.6567.53888.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 03/06] mach-shmobile: Emma Mobile EV2 SMP support V2\0" - "Date\0Fri, 11 May 2012 19:42:20 +0000\0" + "Date\0Sat, 12 May 2012 04:42:20 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0linux@arm.linux.org.uk" + arnd@arndb.de + linux-sh@vger.kernel.org + lethal@linux-sh.org + linux-kernel@vger.kernel.org + rjw@sisk.pl + horms@verge.net.au + olof@lixom.net + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "From: Magnus Damm <damm@opensource.se>\n" @@ -47,7 +56,8 @@ "+smp-$(CONFIG_ARCH_EMEV2)\t+= smp-emev2.o\n" " \n" " # Pinmux setup\n" - " pfc-y\t\t\t\t:--- 0008/arch/arm/mach-shmobile/board-kzm9d.c\n" + " pfc-y\t\t\t\t:=\n" + "--- 0008/arch/arm/mach-shmobile/board-kzm9d.c\n" "+++ work/arch/arm/mach-shmobile/board-kzm9d.c\t2012-05-12 03:23:09.000000000 +0900\n" "@@ -27,6 +27,7 @@\n" " #include <asm/hardware/gic.h>\n" @@ -315,4 +325,4 @@ "+\tmodify_scu_cpu_psr(0, 3 << (cpu * 8));\n" +} -a61d4a7d853ba35c829921c7695b68bb51c03e6271302d09395ccd20298b002d +83ad4315bf18bdefa31c937b1cc62f9c4b5fe74920319220a69f64734dbf4e32
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.