diff --git a/[refs] b/[refs]
index 4400aaf3d6e8..402f33a2ebbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e375f44b6073dd320895753ff05cbfd3f410f66
+refs/heads/master: 06fa7b8066d4dc3f6c9d4c4bf34f385d5a823f13
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
index 9eda9b6df51d..b4196c1a239d 100644
--- a/trunk/Documentation/DocBook/drm.tmpl
+++ b/trunk/Documentation/DocBook/drm.tmpl
@@ -292,8 +292,8 @@
 	information, like register offsets, command buffer status,
 	register state for suspend/resume, etc.  At load time, a
 	driver may simply allocate one and set drm_device.dev_priv
-	appropriately; at unload the driver can free it and set
-	drm_device.dev_priv to NULL.
+	appropriately; it should be freed and drm_device.dev_priv set
+	to NULL when the driver is unloaded.
       </para>
       <para>
 	The DRM supports several counters which may be used for rough