Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 22:52:00 +0000 (14:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 22:52:00 +0000 (14:52 -0800)
commitc47a75a45fa3a9d98b61f7e31983ffab2c44404f
tree4a2a469886fd401648334312018fade9ae98e063
parent0099f77e0a224cc461d0d2930ef0fdb32c61ba64
parentabe1dfab60e1839d115930286cb421f5a5b193f3
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: don't cond_resched() when irqs_disabled()
  ACPI: fix 2.6.28 acpi.debug_level regression