diff for duplicates of <20071219154012.18302de5@hyperion.delvare>

diff --git a/a/1.txt b/N1/1.txt
index 24a07b6..fce0bc5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -187,12 +187,14 @@ Missing ALARM2() for temp8, temp9 and temp10.
 >  
 > @@ -856,7 +918,6 @@ static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, S_IWUSR | S_IRUGO,
 >  
->  static struct attribute *adt7470_attr[] >  {
+>  static struct attribute *adt7470_attr[] =
+>  {
 > -	&sensor_dev_attr_alarms.dev_attr.attr,
 >  	&sensor_dev_attr_alarm_mask.dev_attr.attr,
 >  	&sensor_dev_attr_temp1_max.dev_attr.attr,
 >  	&sensor_dev_attr_temp2_max.dev_attr.attr,
-> @@ -888,6 +949,16 @@ static struct attribute *adt7470_attr[] >  	&sensor_dev_attr_temp8_input.dev_attr.attr,
+> @@ -888,6 +949,16 @@ static struct attribute *adt7470_attr[] =
+>  	&sensor_dev_attr_temp8_input.dev_attr.attr,
 >  	&sensor_dev_attr_temp9_input.dev_attr.attr,
 >  	&sensor_dev_attr_temp10_input.dev_attr.attr,
 > +	&sensor_dev_attr_temp1_alarm.dev_attr.attr,
@@ -208,7 +210,8 @@ Missing ALARM2() for temp8, temp9 and temp10.
 >  	&sensor_dev_attr_fan1_max.dev_attr.attr,
 >  	&sensor_dev_attr_fan2_max.dev_attr.attr,
 >  	&sensor_dev_attr_fan3_max.dev_attr.attr,
-> @@ -900,6 +971,10 @@ static struct attribute *adt7470_attr[] >  	&sensor_dev_attr_fan2_input.dev_attr.attr,
+> @@ -900,6 +971,10 @@ static struct attribute *adt7470_attr[] =
+>  	&sensor_dev_attr_fan2_input.dev_attr.attr,
 >  	&sensor_dev_attr_fan3_input.dev_attr.attr,
 >  	&sensor_dev_attr_fan4_input.dev_attr.attr,
 > +	&sensor_dev_attr_fan1_alarm.dev_attr.attr,
@@ -222,8 +225,3 @@ Missing ALARM2() for temp8, temp9 and temp10.
 
 -- 
 Jean Delvare
-
-_______________________________________________
-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 cac8605..c403013 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020071219040123.GN6870@tree.beaverton.ibm.com\0"
  "From\0Jean Delvare <khali@linux-fr.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH] adt7470: Support per-sensor alarm files\0"
- "Date\0Wed, 19 Dec 2007 14:40:12 +0000\0"
+ "Subject\0Re: [PATCH] adt7470: Support per-sensor alarm files\0"
+ "Date\0Wed, 19 Dec 2007 15:40:12 +0100\0"
  "To\0Darrick J. Wong <djwong@us.ibm.com>\0"
  "Cc\0lm-sensors <lm-sensors@lm-sensors.org>"
   Mark M. Hoffman <mhoffman@lightlink.com>
@@ -197,12 +197,14 @@
  ">  \n"
  "> @@ -856,7 +918,6 @@ static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, S_IWUSR | S_IRUGO,\n"
  ">  \n"
- ">  static struct attribute *adt7470_attr[] >  {\n"
+ ">  static struct attribute *adt7470_attr[] =\n"
+ ">  {\n"
  "> -\t&sensor_dev_attr_alarms.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_alarm_mask.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_temp1_max.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_temp2_max.dev_attr.attr,\n"
- "> @@ -888,6 +949,16 @@ static struct attribute *adt7470_attr[] >  \t&sensor_dev_attr_temp8_input.dev_attr.attr,\n"
+ "> @@ -888,6 +949,16 @@ static struct attribute *adt7470_attr[] =\n"
+ ">  \t&sensor_dev_attr_temp8_input.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_temp9_input.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_temp10_input.dev_attr.attr,\n"
  "> +\t&sensor_dev_attr_temp1_alarm.dev_attr.attr,\n"
@@ -218,7 +220,8 @@
  ">  \t&sensor_dev_attr_fan1_max.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_fan2_max.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_fan3_max.dev_attr.attr,\n"
- "> @@ -900,6 +971,10 @@ static struct attribute *adt7470_attr[] >  \t&sensor_dev_attr_fan2_input.dev_attr.attr,\n"
+ "> @@ -900,6 +971,10 @@ static struct attribute *adt7470_attr[] =\n"
+ ">  \t&sensor_dev_attr_fan2_input.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_fan3_input.dev_attr.attr,\n"
  ">  \t&sensor_dev_attr_fan4_input.dev_attr.attr,\n"
  "> +\t&sensor_dev_attr_fan1_alarm.dev_attr.attr,\n"
@@ -231,11 +234,6 @@
  "\n"
  "\n"
  "-- \n"
- "Jean Delvare\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ Jean Delvare
 
-f858538f947ad51c9eb62eea873027d325ecd61c740d02789296b914b37bf778
+fac588c3496c9ea474c845272d3b08192fca838174764f9e387ba86bcfdbdb3f
