aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/siimage.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 16:56:21 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 16:56:21 -0500
commit0bb324626575e89385ca384d8cdd98fbeaeb0545 (patch)
tree44862850c59aacbd7907300b203c75e7913838e5 /drivers/ide/siimage.c
parent1486b2014a1276b0134c774eddd79fd91352b791 (diff)
parentc4f7bc86279269d0e9520ded0617c609fd5e573a (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* '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
Diffstat (limited to 'drivers/ide/siimage.c')
0 files changed, 0 insertions, 0 deletions