diff --git a/[refs] b/[refs]
index c8df10a6d79f..f3139256dc23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d9ff66da61d1365406586a6b1ed53cf61e6143f
+refs/heads/master: 049262940eb585ff2a671d2db6fa38dfd96687f1
diff --git a/trunk/Documentation/timers/timers-howto.txt b/trunk/Documentation/timers/timers-howto.txt
index c9ef29d2ede3..038f8c77a076 100644
--- a/trunk/Documentation/timers/timers-howto.txt
+++ b/trunk/Documentation/timers/timers-howto.txt
@@ -24,7 +24,7 @@ ATOMIC CONTEXT:
 
 	ndelay(unsigned long nsecs)
 	udelay(unsigned long usecs)
-	mdelay(unsgined long msecs)
+	mdelay(unsigned long msecs)
 
 	udelay is the generally preferred API; ndelay-level
 	precision may not actually exist on many non-PC devices.