---

yaml --- r: 275217 b: refs/heads/master c: 4dc0152 h: refs/heads/master i: 275215: 7d8c8e5 v: v3
git-mirror · Aug 29, 2011 · ddf89f2 · ddf89f2
1 parent 33e80d9
commit ddf89f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 896ee65fb646f9a98243a9f69e5904dff394c78a
+refs/heads/master: 4dc0152d5780f04573046b06a3fb7c7ad9b81afa
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
@@ -573,8 +573,8 @@ void intel_crt_init(struct drm_device *dev)
 	    Since many PC-class graphics devices have similar display output
 	    designs, the DRM provides a set of helper functions to make
 	    output management easier.  The core helper routines handle
-	    encoder re-routing and disabling of unused functions following
-	    mode set.  Using the helpers is optional, but recommended for
+	    encoder re-routing and the disabling of unused functions following
+	    mode setting.  Using the helpers is optional, but recommended for
 	    devices with PC-style architectures (i.e. a set of display planes
 	    for feeding pixels to encoders which are in turn routed to
 	    connectors).  Devices with more complex requirements needing