tree b88bd0df8a97600d09aeecb598ac1f336997a608
parent 6110e02b97377a2903853faf3ecaff0e742fbe93
parent e5c86b5d4a517d10db89456426590ecba1597f1f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190491008 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190491008 -0700

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