Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Sep 2009 17:38:48 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Sep 2009 17:38:48 +0000 (10:38 -0700)
commit73964f6bc8e378715887592abe8a512f403db6a8
treec4aaab48d36ed06243542518ff644c654bdaf586
parent9d98ece16f1a1df0f456a2ee9429d03e82e839a2
parente56d953d190061938b31cabbe01b7f3d76c60bd0
Merge branch 'release' of git://git./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: IA64=y ACPI=n build fix
  ACPI: Kill overly verbose "power state" log messages
  ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
  ACPI: Clarify resource conflict message
  thinkpad-acpi: fix CONFIG_THINKPAD_ACPI_HOTKEY_POLL build problem