diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /Documentation/acpi-hotkey.txt | |
parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
download | kernel_samsung_smdk4412-d344c5e0856ad03278d8700b503762dbc8b86e12.zip kernel_samsung_smdk4412-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.gz kernel_samsung_smdk4412-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.bz2 |
Manual merge with Linus
Diffstat (limited to 'Documentation/acpi-hotkey.txt')
-rw-r--r-- | Documentation/acpi-hotkey.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt index 0acdc80..744f1ae 100644 --- 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. |