From 00ed355a3cedb9da1b48e957df267b84493cbf5d Mon Sep 17 00:00:00 2001
From: Michael Witten <mfwitten@gmail.com>
Date: Thu, 25 Aug 2011 18:34:49 +0000
Subject: [PATCH] --- yaml --- r: 275193 b: refs/heads/master c:
 75aa9df5a2bf2ae90a1f0f6f283278f634ca4233 h: refs/heads/master i:   275191:
 03ecfb2aba07f2b91066662c4443da879314153c v: v3

---
 [refs]                               | 2 +-
 trunk/Documentation/DocBook/drm.tmpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 869dcb533dad..0fecb2c4953d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58f1d652def02db0bdcdf03d01f3483fc18ec392
+refs/heads/master: 75aa9df5a2bf2ae90a1f0f6f283278f634ca4233
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
index e9242c09ac54..eb28cc02d41b 100644
--- a/trunk/Documentation/DocBook/drm.tmpl
+++ b/trunk/Documentation/DocBook/drm.tmpl
@@ -281,9 +281,9 @@
       module parameter to control whether advanced features are
       enabled at load time or in legacy fashion.  If compatibility is
       a concern (e.g. with drivers converted over to the new interfaces
-      from the old ones), care must be taken to prevent incompatible
-      device initialization and control with the currently active
-      userspace drivers.
+      from the old ones), care must be taken to prevent device
+      initialization and control that is incompatible with
+      currently active userspace drivers.
     </para>
 
     <sect2>