diff --git a/[refs] b/[refs]
index c1836a65a301..a23faa3be919 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0216ae9bd0ea8a45736f386a3b8058aefc64dd8
+refs/heads/master: 955a21555dc8dc4a81da7063d595cd7558f413ce
diff --git a/trunk/drivers/s390/scsi/zfcp_ccw.c b/trunk/drivers/s390/scsi/zfcp_ccw.c
index 733fe3bf6285..4f19b28e187f 100644
--- a/trunk/drivers/s390/scsi/zfcp_ccw.c
+++ b/trunk/drivers/s390/scsi/zfcp_ccw.c
@@ -176,8 +176,8 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
 					"ccnoti4", NULL);
 		break;
 	case CIO_BOXED:
-		dev_warn(&adapter->ccw_device->dev,
-			 "The ccw device did not respond in time.\n");
+		dev_warn(&adapter->ccw_device->dev, "The FCP device "
+			 "did not respond within the specified time\n");
 		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5", NULL);
 		break;
 	}