diff --git a/[refs] b/[refs]
index da68e05a0015..5b0b58fbe983 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 186fb9cf6a1154bc9b071adfd72fcf256285eb26
+refs/heads/master: 332c2f80a894d349bfb95fae00daf74477d4afcd
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 9e761b994b4c..c792a6080d51 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3785,7 +3785,7 @@ static void __devinit cciss_wait_for_mode_change_ack(ctlr_info_t *h)
 	for (i = 0; i < MAX_CONFIG_WAIT; i++) {
 		if (!(readl(h->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
 			break;
-		msleep(10);
+		usleep_range(10000, 20000);
 	}
 }