Merge to-linus-stable into to-akpm

diff --cc Documentation/acpi-hotkey.txt
index d57b02a4746b0f0e621b9014a1d68ffdd064c3df,0acdc80c30c2fab156a02238e6146afd6496425f..744f1aec65535f7d3bbadeedcc4f3e8c508709fb
--- 1/Documentation/acpi-hotkey.txt
--- 2/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.

diff --cc drivers/acpi/osl.c
Simple merge