diff for duplicates of <20130906171400.GC10973@ohporter.com>

diff --git a/a/1.txt b/N1/1.txt
index 24114a4..628d286 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -60,6 +60,11 @@ Need #include <linux/err.h>
 > +	kona_gpio->reg_base = devm_ioremap_resource(dev, res);
 > +	if (IS_ERR(kona_gpio->reg_base)) {
 
-gpio-bcm-kona.c:568:2: error: implicit declaration of function ?IS_ERR?
+gpio-bcm-kona.c:568:2: error: implicit declaration of function ‘IS_ERR’
 
 -Matt
+
+_______________________________________________
+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 de3718f..396c546 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,18 @@
  "ref\01377882914-30152-1-git-send-email-markus.mayer@linaro.org\0"
  "ref\01377882914-30152-2-git-send-email-markus.mayer@linaro.org\0"
- "From\0matt.porter@linaro.org (Matt Porter)\0"
- "Subject\0[PATCH v7 1/3] gpio: bcm281xx: Add GPIO driver\0"
+ "From\0Matt Porter <matt.porter@linaro.org>\0"
+ "Subject\0Re: [PATCH v7 1/3] gpio: bcm281xx: Add GPIO driver\0"
  "Date\0Fri, 6 Sep 2013 13:14:01 -0400\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Markus Mayer <markus.mayer@linaro.org>\0"
+ "Cc\0Device Tree List <devicetree@vger.kernel.org>"
+  Linaro Patches <patches@linaro.org>
+  Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>
+  Linus Walleij <linus.walleij@linaro.org>
+  Stephen Warren <swarren@wwwdotorg.org>
+  Christian Daudt <csd@broadcom.com>
+  Tim Kryger <tim.kryger@linaro.org>
+  Markus Mayer <mmayer@broadcom.com>
+ " ARM Kernel List <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Aug 30, 2013 at 10:15:12AM -0700, Markus Mayer wrote:\n"
@@ -68,8 +77,13 @@
  "> +\tkona_gpio->reg_base = devm_ioremap_resource(dev, res);\n"
  "> +\tif (IS_ERR(kona_gpio->reg_base)) {\n"
  "\n"
- "gpio-bcm-kona.c:568:2: error: implicit declaration of function ?IS_ERR?\n"
+ "gpio-bcm-kona.c:568:2: error: implicit declaration of function \342\200\230IS_ERR\342\200\231\n"
  "\n"
- -Matt
+ "-Matt\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
 
-5d0cf7fd2015ed427babfebbe694245221c41a1c3cde5c3d853798ae087bbad5
+bdf486a98ddeff42f9c0877fc5a3d0fd009a1a0ed632ade27284c36c8f3f674f
