Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

Browse source

...

This commit is contained in:

Linus Torvalds 2005-08-16 09:43:13 -07:00

parent cf59001235 fb80cbee4c

commit ca27ea487e

3 changed files with 11 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

Documentation/acpi-hotkey.txt

View file

5

Documentation/kernel-parameters.txt

View file

6

drivers/acpi/osl.c

View file