diff --git a/[refs] b/[refs]
index be9dd3c5ecb9..8c248a1cf6e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cc5753f86589c5fb7e2f4a1fe778db3881f8f72
+refs/heads/master: f4f9eb0ea14c8c478f0e8137b84a366499335aab
diff --git a/trunk/Documentation/pm.txt b/trunk/Documentation/pm.txt
index cc63ae18d147..2ea1149bf6b0 100644
--- a/trunk/Documentation/pm.txt
+++ b/trunk/Documentation/pm.txt
@@ -38,6 +38,12 @@ system the associated daemon will exit gracefully.
 
 Driver Interface -- OBSOLETE, DO NOT USE!
 ----------------*************************
+
+Note: pm_register(), pm_access(), pm_dev_idle() and friends are
+obsolete. Please do not use them. Instead you should properly hook
+your driver into the driver model, and use its suspend()/resume()
+callbacks to do this kind of stuff.
+
 If you are writing a new driver or maintaining an old driver, it
 should include power management support.  Without power management
 support, a single driver may prevent a system with power management