Merge commit 'v2.6.26' into bkl-removal

drivers/char/ipmi/ipmi_watchdog.c

@@ -756,9 +756,8 @@ static ssize_t ipmi_write(struct file *file,
 		rv = ipmi_heartbeat();
 		if (rv)
 			return rv;
-		return 1;
 	}
-	return 0;
+	return len;
 }
 
 static ssize_t ipmi_read(struct file *file,