tree 4a2a469886fd401648334312018fade9ae98e063
parent 0099f77e0a224cc461d0d2930ef0fdb32c61ba64
parent abe1dfab60e1839d115930286cb421f5a5b193f3
author Linus Torvalds <torvalds@linux-foundation.org> 1229986320 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229986320 -0800

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: don't cond_resched() when irqs_disabled()
  ACPI: fix 2.6.28 acpi.debug_level regression