diff for duplicates of <20120516064525.32286.93471.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index b74f31d..2d1410e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,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 b515310..fa65831 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ "ref\020120516064449.32286.77941.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 04/08] mach-shmobile: Emma Mobile EV2 SMP support V3\0" - "Date\0Wed, 16 May 2012 06:45:25 +0000\0" + "Date\0Wed, 16 May 2012 15:45:25 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0horms@verge.net.au" + linux@arm.linux.org.uk + arnd@arndb.de + linux-sh@vger.kernel.org + linux-kernel@vger.kernel.org + rjw@sisk.pl + lethal@linux-sh.org + olof@lixom.net + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "From: Magnus Damm <damm@opensource.se>\n" @@ -50,7 +59,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" @@ -318,4 +328,4 @@ "+\tmodify_scu_cpu_psr(0, 3 << (cpu * 8));\n" +} -7baed24f5d07ca41e573a3e6c425592d1e127a31825bf76cc63996797650be4b +ac9f24e9d146fc56471589f870b7946d0f8d49229ad732d8fc1ffbc18d8a5597
diff --git a/a/1.txt b/N2/1.txt index b74f31d..2d1410e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -43,7 +43,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 b515310..7e68911 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020120516064449.32286.77941.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 04/08] mach-shmobile: Emma Mobile EV2 SMP support V3\0" - "Date\0Wed, 16 May 2012 06:45:25 +0000\0" + "Date\0Wed, 16 May 2012 15:45:25 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -50,7 +50,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" @@ -318,4 +319,4 @@ "+\tmodify_scu_cpu_psr(0, 3 << (cpu * 8));\n" +} -7baed24f5d07ca41e573a3e6c425592d1e127a31825bf76cc63996797650be4b +6acdbffee90a589b41f1b8160c833d3d3b8a99fa4008c815be86b915bfd3233b
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.