diff for duplicates of <4A4BB4AB.7010003@cam.ac.uk>

diff --git a/a/1.txt b/N1/1.txt
index 0de7cd9..9b14393 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -53,7 +53,8 @@ Jonathan
 > 
 > 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
@@ -64,7 +65,8 @@ Jonathan
 >  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
@@ -84,7 +86,8 @@ Jonathan
 >  	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 @@
 > +/*
@@ -546,7 +549,8 @@ Jonathan
 > +	if (time_after(jiffies, data->last_updated + HZ * 50) ||
 > +		!data->valid) {
 > +		for (i = 0; i < NUMBER_OF_AXES; i++) {
-> +			data->offset[i] > i2c_smbus_read_byte_data(client,
+> +			data->offset[i] =
+> i2c_smbus_read_byte_data(client,
 > +						ADXL345_REG_OFS(i));
 > +			dev_dbg(dev, "offset[%d]=%d\n", i,
 > data->offset[i]);
@@ -567,7 +571,8 @@ Jonathan
 > +			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));
 > +
 > +			dev_dbg(dev, "data[%d]=%d\n", i, data->data[i]);
@@ -634,9 +639,3 @@ Jonathan
 > lm-sensors mailing list
 > lm-sensors@lm-sensors.org
 > http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
-
-
-_______________________________________________
-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 2642a53..229e0c2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -62,7 +62,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"
@@ -73,7 +74,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"
@@ -93,7 +95,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"
@@ -555,7 +558,8 @@
  "> +\tif (time_after(jiffies, data->last_updated + HZ * 50) ||\n"
  "> +\t\t!data->valid) {\n"
  "> +\t\tfor (i = 0; i < NUMBER_OF_AXES; i++) {\n"
- "> +\t\t\tdata->offset[i] > i2c_smbus_read_byte_data(client,\n"
+ "> +\t\t\tdata->offset[i] =\n"
+ "> i2c_smbus_read_byte_data(client,\n"
  "> +\t\t\t\t\t\tADXL345_REG_OFS(i));\n"
  "> +\t\t\tdev_dbg(dev, \"offset[%d]=%d\\n\", i,\n"
  "> data->offset[i]);\n"
@@ -576,7 +580,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"
  "> +\t\t\tdev_dbg(dev, \"data[%d]=%d\\n\", i, data->data[i]);\n"
@@ -642,12 +647,6 @@
  "> _______________________________________________\n"
  "> lm-sensors mailing list\n"
  "> lm-sensors@lm-sensors.org\n"
- "> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ > http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-28ffd7d1b2316243d7128fd5014c21551012a49d866cbcd3643d4da9df39c244
+8a9dbb25cacc1b52c75088ba8a108ee050554b8cbcf37d52bf7db745ac6c3f81
