diff for duplicates of <1368611522-9984-28-git-send-email-lee.jones@linaro.org>

diff --git a/a/1.txt b/N1/1.txt
index 7c153ff..ce1b333 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,8 +1,8 @@
 Now the ux500-musb driver has been enabled for Device Tree, there is no
 requirement to register it from platform code.
 
-Acked-by: Fabio Baltieri <fabio.baltieri-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+Acked-by: Fabio Baltieri <fabio.baltieri@linaro.org>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
 ---
  arch/arm/mach-ux500/cpu-db8500.c |    2 --
  1 file changed, 2 deletions(-)
@@ -15,4 +15,10 @@ index e20bc10..f1e7a75 100644
  {
  	struct device *parent = db8500_soc_device_init();
  
--	db8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg);
\ No newline at end of file
+-	db8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg);
+-
+ 	return parent;
+ }
+ 
+-- 
+1.7.10.4
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index de2b908..c1022d3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
   "ref\0001368611522-9984-1-git-send-email-lee.jones\@linaro.org\0"
 ]
 [
-  "ref\0001368611522-9984-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org\0"
-]
-[
-  "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+  "From\0Lee Jones <lee.jones\@linaro.org>\0"
 ]
 [
   "Subject\0[PATCH 27/39] ARM: ux500: Remove ux500-musb platform registation when booting with DT\0"
@@ -14,20 +11,20 @@
   "Date\0Wed, 15 May 2013 10:51:50 +0100\0"
 ]
 [
-  "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " balbi-l0cyMroinI0\@public.gmane.org",
-  " linux-usb-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-crypto-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " davem-fT/PcQaiUtIeIZ0/mPfg9Q\@public.gmane.org",
-  " herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q\@public.gmane.org",
-  " vinod.koul-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org\0"
+  "To\0linux-arm-kernel\@lists.infradead.org",
+  " linux-kernel\@vger.kernel.org",
+  " balbi\@ti.com",
+  " linux-usb\@vger.kernel.org",
+  " linux-crypto\@vger.kernel.org",
+  " davem\@davemloft.net",
+  " herbert\@gondor.hengli.com.au",
+  " vinod.koul\@intel.com\0"
 ]
 [
-  "Cc\0arnd-r2nGTMty4D4\@public.gmane.org",
-  " linus.walleij-0IS4wlFg1OjSUeElwK9/Pw\@public.gmane.org",
-  " srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw\@public.gmane.org",
-  " Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+  "Cc\0arnd\@arndb.de",
+  " linus.walleij\@stericsson.com",
+  " srinidhi.kasagar\@stericsson.com",
+  " Lee Jones <lee.jones\@linaro.org>\0"
 ]
 [
   "\0000:1\0"
@@ -39,8 +36,8 @@
   "Now the ux500-musb driver has been enabled for Device Tree, there is no\n",
   "requirement to register it from platform code.\n",
   "\n",
-  "Acked-by: Fabio Baltieri <fabio.baltieri-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  "Signed-off-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
+  "Acked-by: Fabio Baltieri <fabio.baltieri\@linaro.org>\n",
+  "Signed-off-by: Lee Jones <lee.jones\@linaro.org>\n",
   "---\n",
   " arch/arm/mach-ux500/cpu-db8500.c |    2 --\n",
   " 1 file changed, 2 deletions(-)\n",
@@ -53,7 +50,13 @@
   " {\n",
   " \tstruct device *parent = db8500_soc_device_init();\n",
   " \n",
-  "-\tdb8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg);"
+  "-\tdb8500_add_usb(parent, usb_db8500_dma_cfg, usb_db8500_dma_cfg);\n",
+  "-\n",
+  " \treturn parent;\n",
+  " }\n",
+  " \n",
+  "-- \n",
+  "1.7.10.4"
 ]
 
-9b42272d217b179932470c1e1dd352a9b381bde4359df554090a123a2cac2ab3
+a0a71f504e5ad9bda8e1f3dbe23146b3768b9379de50fad05aedba302146c9f1
