diff for duplicates of <20160502083850.GC963@cbox>

diff --git a/a/1.txt b/N1/1.txt
index 098740a..789a5f3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -76,13 +76,13 @@ insert unsorted, and sort in the end.
 > >>   Info: Loaded kernel to 0x80080000 (69624 bytes)
 > >>   Info: Placing fdt at 0x8fe00000 - 0x8fffffff
 > >>   # Warning: The maximum recommended amount of VCPUs is 4
-> >>   Info: virtio-mmio.devices=0x200@0x10000:36
+> >>   Info: virtio-mmio.devices=0x200 at 0x10000:36
 > >>
-> >>   Info: virtio-mmio.devices=0x200@0x10200:37
+> >>   Info: virtio-mmio.devices=0x200 at 0x10200:37
 > >>
-> >>   Info: virtio-mmio.devices=0x200@0x10400:38
+> >>   Info: virtio-mmio.devices=0x200 at 0x10400:38
 > >>
-> >>   Info: virtio-mmio.devices=0x200@0x10600:39
+> >>   Info: virtio-mmio.devices=0x200 at 0x10600:39
 > >>
 > >> INFO: rcu_sched self-detected stall on CPU
 > >>  0-...: (5249 ticks this GP) idle=589/140000000000001/0 softirq=393/393 fqs=5244 
@@ -133,7 +133,7 @@ insert unsorted, and sort in the end.
 > > Vladimir
 > > _______________________________________________
 > > kvmarm mailing list
-> > kvmarm@lists.cs.columbia.edu
+> > kvmarm at lists.cs.columbia.edu
 > > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
 > > 
 > > 
diff --git a/a/content_digest b/N1/content_digest
index 9d962ea..c35c153 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,15 +2,10 @@
  "ref\01461861973-26464-33-git-send-email-andre.przywara@arm.com\0"
  "ref\0572369F0.20704@arm.com\0"
  "ref\057236E3B.2000501@arm.com\0"
- "From\0Christoffer Dall <christoffer.dall@linaro.org>\0"
- "Subject\0Re: [PATCH v2 32/54] KVM: arm/arm64: vgic-new: Add GICv3 MMIO handling framework\0"
+ "From\0christoffer.dall@linaro.org (Christoffer Dall)\0"
+ "Subject\0[PATCH v2 32/54] KVM: arm/arm64: vgic-new: Add GICv3 MMIO handling framework\0"
  "Date\0Mon, 2 May 2016 10:38:50 +0200\0"
- "To\0Vladimir Murzin <vladimir.murzin@arm.com>\0"
- "Cc\0Andre Przywara <andre.przywara@arm.com>"
-  Marc Zyngier <marc.zyngier@arm.com>
-  kvmarm@lists.cs.columbia.edu
-  linux-arm-kernel@lists.infradead.org
- " kvm@vger.kernel.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 29, 2016 at 03:22:51PM +0100, Vladimir Murzin wrote:\n"
@@ -91,13 +86,13 @@
  "> >>   Info: Loaded kernel to 0x80080000 (69624 bytes)\n"
  "> >>   Info: Placing fdt at 0x8fe00000 - 0x8fffffff\n"
  "> >>   # Warning: The maximum recommended amount of VCPUs is 4\n"
- "> >>   Info: virtio-mmio.devices=0x200@0x10000:36\n"
+ "> >>   Info: virtio-mmio.devices=0x200 at 0x10000:36\n"
  "> >>\n"
- "> >>   Info: virtio-mmio.devices=0x200@0x10200:37\n"
+ "> >>   Info: virtio-mmio.devices=0x200 at 0x10200:37\n"
  "> >>\n"
- "> >>   Info: virtio-mmio.devices=0x200@0x10400:38\n"
+ "> >>   Info: virtio-mmio.devices=0x200 at 0x10400:38\n"
  "> >>\n"
- "> >>   Info: virtio-mmio.devices=0x200@0x10600:39\n"
+ "> >>   Info: virtio-mmio.devices=0x200 at 0x10600:39\n"
  "> >>\n"
  "> >> INFO: rcu_sched self-detected stall on CPU\n"
  "> >>  0-...: (5249 ticks this GP) idle=589/140000000000001/0 softirq=393/393 fqs=5244 \n"
@@ -148,10 +143,10 @@
  "> > Vladimir\n"
  "> > _______________________________________________\n"
  "> > kvmarm mailing list\n"
- "> > kvmarm@lists.cs.columbia.edu\n"
+ "> > kvmarm at lists.cs.columbia.edu\n"
  "> > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm\n"
  "> > \n"
  "> > \n"
  >
 
-724dcaf2fac9454cb4853fbd312fae5b50fbf0d2c0c5d49129d320927e125128
+6e68a24afc055cf0f3928787fd1d123e8a11f933c364e4ad26280c3099e74198
