diff for duplicates of <20150717054842.GS17550@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index 6553be8..fa0add6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,8 +10,8 @@
 > > I'm getthing this with omap2plus_defconfig with the last patch
 > > applied:
 > > 
-> > arch/arm/mach-omap2/omap4-common.c: In function ‘omap4_sram_init’:
-> > arch/arm/mach-omap2/omap4-common.c:138:14: error: implicit declaration of function ‘of_get_named_gen_pool’ [-Werror=implicit-function-declaration]
+> > arch/arm/mach-omap2/omap4-common.c: In function ?omap4_sram_init?:
+> > arch/arm/mach-omap2/omap4-common.c:138:14: error: implicit declaration of function ?of_get_named_gen_pool? [-Werror=implicit-function-declaration]
 > >   sram_pool = of_get_named_gen_pool(np, "sram", 0);
 > >               ^
 > > arch/arm/mach-omap2/omap4-common.c:138:12: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
@@ -25,8 +25,3 @@ OK with that change looks good to me, so please feel free to
 add for the whole series:
 
 Acked-by: Tony Lindgren <tony@atomide.com>
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index c9a2e30..c8ba584 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,10 @@
  "ref\0E1ZFQmM-0006GN-5Y@rmk-PC.arm.linux.org.uk\0"
  "ref\020150716064854.GG17550@atomide.com\0"
  "ref\020150716135413.GD7576@n2100.arm.linux.org.uk\0"
- "From\0Tony Lindgren <tony@atomide.com>\0"
- "Subject\0Re: [PATCH 4/4] ARM: omap2: restore OMAP4 barrier behaviour\0"
+ "From\0tony@atomide.com (Tony Lindgren)\0"
+ "Subject\0[PATCH 4/4] ARM: omap2: restore OMAP4 barrier behaviour\0"
  "Date\0Thu, 16 Jul 2015 22:48:42 -0700\0"
- "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0"
- "Cc\0linux-omap@vger.kernel.org"
-  Will Deacon <will.deacon@arm.com>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "* Russell King - ARM Linux <linux@arm.linux.org.uk> [150716 06:56]:\n"
@@ -23,8 +20,8 @@
  "> > I'm getthing this with omap2plus_defconfig with the last patch\n"
  "> > applied:\n"
  "> > \n"
- "> > arch/arm/mach-omap2/omap4-common.c: In function \342\200\230omap4_sram_init\342\200\231:\n"
- "> > arch/arm/mach-omap2/omap4-common.c:138:14: error: implicit declaration of function \342\200\230of_get_named_gen_pool\342\200\231 [-Werror=implicit-function-declaration]\n"
+ "> > arch/arm/mach-omap2/omap4-common.c: In function ?omap4_sram_init?:\n"
+ "> > arch/arm/mach-omap2/omap4-common.c:138:14: error: implicit declaration of function ?of_get_named_gen_pool? [-Werror=implicit-function-declaration]\n"
  "> >   sram_pool = of_get_named_gen_pool(np, \"sram\", 0);\n"
  "> >               ^\n"
  "> > arch/arm/mach-omap2/omap4-common.c:138:12: warning: assignment makes pointer from integer without a cast [-Wint-conversion]\n"
@@ -37,11 +34,6 @@
  "OK with that change looks good to me, so please feel free to\n"
  "add for the whole series:\n"
  "\n"
- "Acked-by: Tony Lindgren <tony@atomide.com>\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ Acked-by: Tony Lindgren <tony@atomide.com>
 
-bf3978ce806e050b65a9a23c10b99e2963506b9317962559411d7a114f86517d
+43eba861dbe612e91f0b2b9d5f8b26fa5e74212e1d7624183c72f9d4e5b9f84c
