From: Len Brown <len.brown@intel.com>
Date: Mon, 15 Aug 2005 19:52:00 +0000 (-0400)
Subject: Merge to-linus-stable into to-akpm
X-Git-Tag: v2.6.14-rc1~256^2~14^2~30^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6869979bec3cc2efddc7359f30ba37642084fb7;p=linux-2.6

Merge to-linus-stable into to-akpm
---

f6869979bec3cc2efddc7359f30ba37642084fb7
diff --cc Documentation/acpi-hotkey.txt
index d57b02a474,0acdc80c30..744f1aec65
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
@@@ -34,5 -34,5 +34,5 @@@ attached to /proc/acpi/hotkey/poll_meth
  created.  Please use command "cat /proc/acpi/hotkey/polling_method" 
  to retrieve it.
  
- Note: Use cmdline "acpi_specific_hotkey" to enable legacy platform
- specific drivers.
+ Note: Use cmdline "acpi_generic_hotkey" to over-ride
 -loading any platform specific drivers.
++platform-specific with generic driver.