diff --git a/[refs] b/[refs]
index 9a0e97cf3805..0e7537140de6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d532134d4cad1da0ad0efc1d5db9f74475df80c6
+refs/heads/master: cd7b80079b120406de902ee1eaa2dbdaa867dada
diff --git a/trunk/drivers/char/watchdog/ibmasr.c b/trunk/drivers/char/watchdog/ibmasr.c
index a32c073d29bc..4f90015be7dd 100644
--- a/trunk/drivers/char/watchdog/ibmasr.c
+++ b/trunk/drivers/char/watchdog/ibmasr.c
@@ -267,7 +267,10 @@ static int asr_ioctl(struct inode *inode, struct file *file,
 			asr_toggle();
 			return 0;
 
-
+		/*
+		 * The hardware has a fixed timeout value, so WDIOC_SETTIMEOUT
+		 * is a noop and WDIOC_GETTIMEOUT always returns 256.
+		 */
 		case WDIOC_SETTIMEOUT:
 			if (get_user(heartbeat, p))
 				return -EFAULT;