diff for duplicates of <20080701124657.30446.28078.sendpatchset@rx1.opensource.se>

diff --git a/a/1.txt b/N1/1.txt
index f3e3a52..66d52c2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -49,7 +49,8 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 -static spinlock_t *pxa_camera_spinlock_alloc(struct soc_camera_file *icf)
 +static int pxa_camera_file_alloc(struct soc_camera_file *icf)
  {
- 	struct soc_camera_host *ici  		to_soc_camera_host(icf->icd->dev.parent);
+ 	struct soc_camera_host *ici =
+ 		to_soc_camera_host(icf->icd->dev.parent);
  	struct pxa_camera_dev *pcdev = ici->priv;
  
 -	return &pcdev->lock;
@@ -172,3 +173,8 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
  };
  
  struct soc_camera_link {
+
+--
+video4linux-list mailing list
+Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
+https://www.redhat.com/mailman/listinfo/video4linux-list
diff --git a/a/content_digest b/N1/content_digest
index 726489f..5874096 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020080701124638.30446.81449.sendpatchset@rx1.opensource.se\0"
  "From\0Magnus Damm <magnus.damm@gmail.com>\0"
  "Subject\0[PATCH 02/07] soc_camera: Let the host select videobuf_queue type\0"
- "Date\0Tue, 01 Jul 2008 12:46:57 +0000\0"
+ "Date\0Tue, 01 Jul 2008 21:46:57 +0900\0"
  "To\0video4linux-list@redhat.com\0"
  "Cc\0akpm@linux-foundation.org"
   lethal@linux-sh.org
@@ -60,7 +60,8 @@
  "-static spinlock_t *pxa_camera_spinlock_alloc(struct soc_camera_file *icf)\n"
  "+static int pxa_camera_file_alloc(struct soc_camera_file *icf)\n"
  " {\n"
- " \tstruct soc_camera_host *ici  \t\tto_soc_camera_host(icf->icd->dev.parent);\n"
+ " \tstruct soc_camera_host *ici =\n"
+ " \t\tto_soc_camera_host(icf->icd->dev.parent);\n"
  " \tstruct pxa_camera_dev *pcdev = ici->priv;\n"
  " \n"
  "-\treturn &pcdev->lock;\n"
@@ -182,6 +183,11 @@
  "+\tvoid (*file_free)(struct soc_camera_file *);\n"
  " };\n"
  " \n"
-  struct soc_camera_link {
+ " struct soc_camera_link {\n"
+ "\n"
+ "--\n"
+ "video4linux-list mailing list\n"
+ "Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe\n"
+ https://www.redhat.com/mailman/listinfo/video4linux-list
 
-ec3cf6f57f1f8adc3c2a636fa797ffbf23bcf54a55c5be3fa8222e98c023cd4a
+ef8f935b7a7e477a3f9989e790acfa3fa06316cb001db9c87389614f29b38f61
