Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

Browse source

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  acerhdf: return temperature in milidegree instead of degree
  thinkpad-acpi: fix detection of old ThinkPads
  thinkpad-acpi: fix sign of ERESTARTSYS return
  ACPI: Add Thinkpad T400, T500 to OSI(Linux) white-list
  ACPICA: Silence the warning about _BIF returning the buffer
  ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700

...

This commit is contained in:

Linus Torvalds 2009-11-30 13:56:21 -08:00

parent 1486b2014a c4f7bc8627

commit 0bb3246265

5 changed files with 53 additions and 15 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

5

drivers/acpi/acpica/acpredef.h

View file

17

drivers/acpi/blacklist.c

View file

8

drivers/acpi/sleep.c

View file

12

drivers/platform/x86/acerhdf.c

View file

26

drivers/platform/x86/thinkpad_acpi.c

View file