diff for duplicates of <1472905.aEm3bdqRZp@lenovobook>

diff --git a/a/1.txt b/N1/1.txt
index 2d9d02c..5d2a83e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,9 +14,14 @@ index c749700..f084610 100644
  							 name);
  		chan = of_iio_channel_get(np, index);
 -		if (!IS_ERR(chan))
-+		if (!IS_ERR(chan) || PTR_ERR(chan) == -EPROBE_DEFER)
++		if (!IS_ERR(chan) || PTR_ERR(chan) = -EPROBE_DEFER)
  			break;
  		else if (name && index >= 0) {
  			pr_err("ERROR: could not get IIO channel %s:%s(%i)\n",
 -- 
 2.1.0
+
+_______________________________________________
+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 10377d6..d9a738e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Johannes Pointner <johannes.pointner@gmail.com>\0"
- "Subject\0[PATCH] iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name\0"
- "Date\0Mon, 25 Aug 2014 10:04:45 +0200\0"
+ "Subject\0[lm-sensors] [PATCH] iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name\0"
+ "Date\0Mon, 25 Aug 2014 08:04:45 +0000\0"
  "To\0Jonathan Cameron <jic23@kernel.org>\0"
  "Cc\0linux-iio@vger.kernel.org"
   'Guenter Roeck' <linux@roeck-us.net>
@@ -24,11 +24,16 @@
  " \t\t\t\t\t\t\t name);\n"
  " \t\tchan = of_iio_channel_get(np, index);\n"
  "-\t\tif (!IS_ERR(chan))\n"
- "+\t\tif (!IS_ERR(chan) || PTR_ERR(chan) == -EPROBE_DEFER)\n"
+ "+\t\tif (!IS_ERR(chan) || PTR_ERR(chan) = -EPROBE_DEFER)\n"
  " \t\t\tbreak;\n"
  " \t\telse if (name && index >= 0) {\n"
  " \t\t\tpr_err(\"ERROR: could not get IIO channel %s:%s(%i)\\n\",\n"
  "-- \n"
- 2.1.0
+ "2.1.0\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-17ce917e59d4282882a7121e84999f71e821db33d2bb09344ecdc426da06498d
+bdd5c638f7e4dacff2fad610e120427cf40e6ee060462cc619ae51d00b31702f
