diff for duplicates of <20080503201659.2ab17cbc@hyperion.delvare>

diff --git a/a/1.txt b/N1/1.txt
index 21a7877..8293c8b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,7 +21,7 @@ I'd rather play it safe and prevent any access to the SMBus on that
 machine by not letting the i2c-piix4 driver attach to the SMBus host
 device on that machine.
 
-Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
 ---
  drivers/i2c/busses/i2c-piix4.c |   25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
@@ -65,7 +65,7 @@ Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
  	/* Don't access SMBus on IBM systems which get corrupted eeproms */
 -	if (dmi_check_system(piix4_dmi_table) &&
 +	if (dmi_check_system(piix4_dmi_ibm) &&
- 			PIIX4_dev->vendor == PCI_VENDOR_ID_INTEL) {
+ 			PIIX4_dev->vendor = PCI_VENDOR_ID_INTEL) {
  		dev_err(&PIIX4_dev->dev, "IBM system detected; this module "
  			"may corrupt your serial eeprom! Refusing to load "
 
@@ -73,6 +73,6 @@ Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
 Jean Delvare
 
 _______________________________________________
-i2c mailing list
-i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
-http://lists.lm-sensors.org/mailman/listinfo/i2c
+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 ab13dad..f4f1ece 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,9 +3,9 @@
  "ref\01209828454.4289.1.camel@debian-9850.ag-home.muc\0"
  "ref\020080503182701.58a0c146@hyperion.delvare\0"
  "ref\020080503182701.58a0c146-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org\0"
- "From\0Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\0"
- "Subject\0[PATCH] i2c-piix4: Blacklist the Sapphire AM2RD790 motherboard\0"
- "Date\0Sat, 3 May 2008 20:16:59 +0200\0"
+ "From\0Jean Delvare <khali@linux-fr.org>\0"
+ "Subject\0[lm-sensors] [PATCH] i2c-piix4: Blacklist the Sapphire AM2RD790\0"
+ "Date\0Sat, 03 May 2008 18:16:59 +0000\0"
  "To\0achim <achim-888L293l2dDzs492ZWNkEA@public.gmane.org>\0"
  "Cc\0Linux I2C <i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>"
  " LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>\0"
@@ -34,7 +34,7 @@
  "machine by not letting the i2c-piix4 driver attach to the SMBus host\n"
  "device on that machine.\n"
  "\n"
- "Signed-off-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>\n"
+ "Signed-off-by: Jean Delvare <khali@linux-fr.org>\n"
  "---\n"
  " drivers/i2c/busses/i2c-piix4.c |   25 +++++++++++++++++++++++--\n"
  " 1 file changed, 23 insertions(+), 2 deletions(-)\n"
@@ -78,7 +78,7 @@
  " \t/* Don't access SMBus on IBM systems which get corrupted eeproms */\n"
  "-\tif (dmi_check_system(piix4_dmi_table) &&\n"
  "+\tif (dmi_check_system(piix4_dmi_ibm) &&\n"
- " \t\t\tPIIX4_dev->vendor == PCI_VENDOR_ID_INTEL) {\n"
+ " \t\t\tPIIX4_dev->vendor = PCI_VENDOR_ID_INTEL) {\n"
  " \t\tdev_err(&PIIX4_dev->dev, \"IBM system detected; this module \"\n"
  " \t\t\t\"may corrupt your serial eeprom! Refusing to load \"\n"
  "\n"
@@ -86,8 +86,8 @@
  "Jean Delvare\n"
  "\n"
  "_______________________________________________\n"
- "i2c mailing list\n"
- "i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/i2c
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-d7f4a53177fa313d1762f0b3f968627b56fad0dd688c2a9142eaafa9c54c7ebc
+965d8273ef2dc4d7576ab3da7acc8dbdd507d205318b532f65549b31229433ee
