From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 23 Jun 2007 22:12:53 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v2.6.22-rc6~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bbf14513ff0e1301a767ed8610babcc34cc132e6;p=~emulex%2Finfiniband.git

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: 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
---

bbf14513ff0e1301a767ed8610babcc34cc132e6