diff --git a/[refs] b/[refs]
index 6389a225e97d..78569c8f04c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07faf693c59b449b6637ea056e5826c85dcd265
+refs/heads/master: 5b658bf2bf9e47f9a67cd26b1c69e4441eaf04fc
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
index 1b2e3c37e377..d2f1ddaa3ca0 100644
--- a/trunk/Documentation/DocBook/drm.tmpl
+++ b/trunk/Documentation/DocBook/drm.tmpl
@@ -346,7 +346,7 @@
       </para>
       <para>
 	If your device supports interrupt generation, you may want to
-	setup an interrupt handler at driver load time as well.  This
+	set up an interrupt handler at driver load time as well.  This
 	is done using the drm_irq_install() function.  If your device
 	supports vertical blank interrupts, it should call
 	drm_vblank_init() to initialize the core vblank handling code before