diff for duplicates of <20150716064854.GG17550@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index c327a22..3ec0b9b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,8 +8,8 @@ Hi,
 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]
@@ -18,8 +18,3 @@ arch/arm/mach-omap2/omap4-common.c:138:12: warning: assignment makes pointer fro
 Regards,
 
 Tony
-
-_______________________________________________
-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 e17b6c4..dc9bed7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,12 +1,9 @@
  "ref\020150715174647.GA7557@n2100.arm.linux.org.uk\0"
  "ref\0E1ZFQmM-0006GN-5Y@rmk-PC.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\0Wed, 15 Jul 2015 23:48:54 -0700\0"
- "To\0Russell King <rmk+kernel@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"
  "Hi,\n"
@@ -19,8 +16,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"
@@ -28,11 +25,6 @@
  "            ^\n"
  "Regards,\n"
  "\n"
- "Tony\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
+ Tony
 
-5bb64bcf59054089b01d5061f2dd406961c264e0f75b7b6316dc51f4ca7961aa
+ee8242a4f0b7280228f9781b867aa526b0b68badc37e3e8fc3342d63889666de
