---

yaml --- r: 275224 b: refs/heads/master c: e355b20 h: refs/heads/master v: v3
git-mirror · Aug 29, 2011 · 8277e1f · 8277e1f
1 parent 9b54325
commit 8277e1f
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: b8c6e0fe46fcd60f58089365dd96dcf04f95263b
+refs/heads/master: e355b2014da06458385902c47edf193a997895fc
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
@@ -735,8 +735,8 @@ void intel_crt_init(struct drm_device *dev)
       <para>
 	Perhaps the most important GEM function is providing a command
 	execution interface to clients.  Client programs construct command
-	buffers containing references to previously allocated memory objects
-	and submit them to GEM.  At that point, GEM takes care to bind
+	buffers containing references to previously allocated memory objects,
+	and then submit them to GEM.  At that point, GEM takes care to bind
 	all the objects into the GTT, execute the buffer, and provide
 	necessary synchronization between clients accessing the same buffers.
 	This often involves evicting some objects from the GTT and re-binding