Merge branch 'thinkpad' into release

Browse source

...

This commit is contained in:

Len Brown 2009-12-30 02:51:05 -05:00

parent 1ae22af7d7 6e5b08ee94

commit ea840aa2d0

3 changed files with 123 additions and 22 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

58

Documentation/laptops/thinkpad-acpi.txt

View file

28

drivers/platform/x86/Kconfig

View file

59

drivers/platform/x86/thinkpad_acpi.c

View file