diff for duplicates of <1341488454.18786.15.camel@lappy>

diff --git a/a/1.txt b/N1/1.txt
index 4b307cc..8ca2566 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -41,8 +41,3 @@ index f5432b6..12b6180 100644
         writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN);
  
         size = PAGE_ALIGN(vring_size(info->num, VIRTIO_MMIO_VRING_ALIGN));
-
-_______________________________________________
-Virtualization mailing list
-Virtualization@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/virtualization
diff --git a/a/content_digest b/N1/content_digest
index 695eb13..21abef5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,11 +4,11 @@
  "Subject\0Re: [net-next RFC V5 2/5] virtio_ring: move queue_index to vring_virtqueue\0"
  "Date\0Thu, 05 Jul 2012 13:40:54 +0200\0"
  "To\0Jason Wang <jasowang@redhat.com>\0"
- "Cc\0krkumar2@in.ibm.com"
-  habanero@linux.vnet.ibm.com
+ "Cc\0mst@redhat.com"
   mashirle@us.ibm.com
-  kvm@vger.kernel.org
-  mst@redhat.com
+  krkumar2@in.ibm.com
+  habanero@linux.vnet.ibm.com
+  rusty@rustcorp.com.au
   netdev@vger.kernel.org
   linux-kernel@vger.kernel.org
   virtualization@lists.linux-foundation.org
@@ -16,6 +16,8 @@
   tahm@linux.vnet.ibm.com
   jwhan@filewood.snu.ac.kr
   davem@davemloft.net
+  akong@redhat.com
+  kvm@vger.kernel.org
  " sri@us.ibm.com\0"
  "\00:1\0"
  "b\0"
@@ -61,11 +63,6 @@
  "+       writel(virtqueue_get_queue_index(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_SEL);\n"
  "        writel(0, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN);\n"
  " \n"
- "        size = PAGE_ALIGN(vring_size(info->num, VIRTIO_MMIO_VRING_ALIGN));\n"
- "\n"
- "_______________________________________________\n"
- "Virtualization mailing list\n"
- "Virtualization@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/virtualization
+         size = PAGE_ALIGN(vring_size(info->num, VIRTIO_MMIO_VRING_ALIGN));
 
-cc9417050db3e6cf33f641d4f5771686c835cefa722e7e2d29053680f20add9f
+f3006be8606c7d507fe99e3f1509ca9240d0204e4e70c7d63a74a77628fc5732
