diff for duplicates of <4A4CF07B.3090600@cam.ac.uk>

diff --git a/a/1.txt b/N1/1.txt
index f99cafd..9abac60 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,8 @@ concentrate on the bits that will be there whatever.
 > 
 > Signed-off-by: Chris Verges <chrisv@cyberswitching.com>
 > Index: drivers/hwmon/Makefile
-> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/Makefile	(revision 33)
+> ===================================================================
+> --- linux-2.6.29.3-orig/drivers/hwmon/Makefile	(revision 33)
 > +++ linux-2.6.29.3/drivers/hwmon/Makefile	(revision 49)
 > @@ -29,6 +29,7 @@
 >  obj-$(CONFIG_SENSORS_ADT7470)	+= adt7470.o
@@ -29,7 +30,8 @@ concentrate on the bits that will be there whatever.
 >  obj-$(CONFIG_SENSORS_APPLESMC)	+= applesmc.o
 >  obj-$(CONFIG_SENSORS_AMS)	+= ams/
 > Index: drivers/hwmon/Kconfig
-> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/Kconfig	(revision 33)
+> ===================================================================
+> --- linux-2.6.29.3-orig/drivers/hwmon/Kconfig	(revision 33)
 > +++ linux-2.6.29.3/drivers/hwmon/Kconfig	(revision 49)
 > @@ -199,6 +199,16 @@
 >  	  This driver can also be build as a module.  If so, the module
@@ -57,7 +59,8 @@ you can't tell them appart which is rather annoying!
 >  	tristate "AMD Athlon64/FX or Opteron temperature sensor"
 >  	depends on X86 && PCI && EXPERIMENTAL
 > Index: drivers/hwmon/adxl345.c
-> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/adxl345.c	(revision 0)
+> ===================================================================
+> --- linux-2.6.29.3-orig/drivers/hwmon/adxl345.c	(revision 0)
 > +++ linux-2.6.29.3/drivers/hwmon/adxl345.c	(revision 49)
 > @@ -0,0 +1,521 @@
 > +/*
@@ -620,7 +623,8 @@ i2c_smbus_write_i2c_block_data()
 > +			data->data[i] = i2c_smbus_read_byte_data(client,
 > +						ADXL345_REG_DATA(i*2+1))
 > << 8;
-> +			data->data[i] |> i2c_smbus_read_byte_data(client,
+> +			data->data[i] |=
+> i2c_smbus_read_byte_data(client,
 > +						ADXL345_REG_DATA(i*2));
 
 Here you could use a word read, or the multi register read described
@@ -714,8 +718,3 @@ Anyhow always good to see more accelerometer drivers!
 Thanks
 
 Jonathan
-
-_______________________________________________
-lm-sensors mailing list
-lm-sensors@lm-sensors.org
-http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
diff --git a/a/content_digest b/N1/content_digest
index 5c477e5..e28ddb9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -29,7 +29,8 @@
  "> \n"
  "> Signed-off-by: Chris Verges <chrisv@cyberswitching.com>\n"
  "> Index: drivers/hwmon/Makefile\n"
- "> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/Makefile\t(revision 33)\n"
+ "> ===================================================================\n"
+ "> --- linux-2.6.29.3-orig/drivers/hwmon/Makefile\t(revision 33)\n"
  "> +++ linux-2.6.29.3/drivers/hwmon/Makefile\t(revision 49)\n"
  "> @@ -29,6 +29,7 @@\n"
  ">  obj-$(CONFIG_SENSORS_ADT7470)\t+= adt7470.o\n"
@@ -40,7 +41,8 @@
  ">  obj-$(CONFIG_SENSORS_APPLESMC)\t+= applesmc.o\n"
  ">  obj-$(CONFIG_SENSORS_AMS)\t+= ams/\n"
  "> Index: drivers/hwmon/Kconfig\n"
- "> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/Kconfig\t(revision 33)\n"
+ "> ===================================================================\n"
+ "> --- linux-2.6.29.3-orig/drivers/hwmon/Kconfig\t(revision 33)\n"
  "> +++ linux-2.6.29.3/drivers/hwmon/Kconfig\t(revision 49)\n"
  "> @@ -199,6 +199,16 @@\n"
  ">  \t  This driver can also be build as a module.  If so, the module\n"
@@ -68,7 +70,8 @@
  ">  \ttristate \"AMD Athlon64/FX or Opteron temperature sensor\"\n"
  ">  \tdepends on X86 && PCI && EXPERIMENTAL\n"
  "> Index: drivers/hwmon/adxl345.c\n"
- "> =================================> --- linux-2.6.29.3-orig/drivers/hwmon/adxl345.c\t(revision 0)\n"
+ "> ===================================================================\n"
+ "> --- linux-2.6.29.3-orig/drivers/hwmon/adxl345.c\t(revision 0)\n"
  "> +++ linux-2.6.29.3/drivers/hwmon/adxl345.c\t(revision 49)\n"
  "> @@ -0,0 +1,521 @@\n"
  "> +/*\n"
@@ -631,7 +634,8 @@
  "> +\t\t\tdata->data[i] = i2c_smbus_read_byte_data(client,\n"
  "> +\t\t\t\t\t\tADXL345_REG_DATA(i*2+1))\n"
  "> << 8;\n"
- "> +\t\t\tdata->data[i] |> i2c_smbus_read_byte_data(client,\n"
+ "> +\t\t\tdata->data[i] |=\n"
+ "> i2c_smbus_read_byte_data(client,\n"
  "> +\t\t\t\t\t\tADXL345_REG_DATA(i*2));\n"
  "\n"
  "Here you could use a word read, or the multi register read described\n"
@@ -724,11 +728,6 @@
  "\n"
  "Thanks\n"
  "\n"
- "Jonathan\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ Jonathan
 
-8ff72faf2e377ae955a7467ca98ce9a9d26b7a4ac453c4a0e9afcd158ab70957
+dcb6b332dd2c954c7208642e7cb90f96b44a65b8261224beb86ac749a4d9ca86
