]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 22 Sep 2007 19:56:48 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 22 Sep 2007 19:56:48 +0000 (12:56 -0700)
* '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


Trivial merge