]> err.no Git - linux-2.6/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 23 Jun 2007 22:12:53 +0000 (15:12 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 23 Jun 2007 22:12:53 +0000 (15:12 -0700)
* '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


Trivial merge