diff --git a/[refs] b/[refs]
index 570e056489c6..6389a225e97d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8814630f0b59421e558f4403b79f5dc3a025a386
+refs/heads/master: f07faf693c59b449b6637ea056e5826c85dcd265
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
index 25e0f460a973..1b2e3c37e377 100644
--- a/trunk/Documentation/DocBook/drm.tmpl
+++ b/trunk/Documentation/DocBook/drm.tmpl
@@ -342,7 +342,7 @@
 	DRM_WRITEn() macros to access the registers on your device, or
 	use driver specific versions to offset into your MMIO space
 	relative to a driver specific base pointer (see I915_READ for
-	example).
+	an example).
       </para>
       <para>
 	If your device supports interrupt generation, you may want to