Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[karo-tx-linux.git] / Documentation / acpi-hotkey.txt

diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
index 0acdc80c30c2fab156a02238e6146afd6496425f..744f1aec65535f7d3bbadeedcc4f3e8c508709fb 100644 (file)
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
@@ -35,4 +35,4 @@ created.  Please use command "cat /proc/acpi/hotkey/polling_method"
 to retrieve it.
 
 Note: Use cmdline "acpi_generic_hotkey" to over-ride
-loading any platform specific drivers.
+platform-specific with generic driver.