summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-22 12:56:48 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-22 12:56:48 -0700
commit1f0cff6e4d579ab0fe671c02fcd842694e46b90f (patch)
treeb88bd0df8a97600d09aeecb598ac1f336997a608 /include
parent6110e02b97377a2903853faf3ecaff0e742fbe93 (diff)
parente5c86b5d4a517d10db89456426590ecba1597f1f (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: ACPI: suspend: consolidate handling of Sx states addendum ACPI: suspend: consolidate handling of Sx states. ACPI: video: remove dmesg spam ACPI: video: _DOS=0 by default to prevent hotkey hang
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions