Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
commitbbf14513ff0e1301a767ed8610babcc34cc132e6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 23 Jun 2007 22:12:53 +0000 (23 15:12 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 23 Jun 2007 22:12:53 +0000 (23 15:12 -0700)
treeacd124c2699bb6e1c0d7369913ee66fd999fde61
parentaf6f2b2b5ce478d77a34497f9058bc65093c761a
parent629cf6d74beca87d57cea3e38edf7522c397d41e
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: fix 2.6.20 SMP boot regression
  ACPICA: fix error path in new external package objects as method arguments
  ACPI: gracefully print null trip-point device