From: Linus Torvalds Date: Sun, 29 Jun 2008 19:22:30 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... X-Git-Tag: v2.6.26-rc9~92 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0acbbee440fadf45164cc9537ee7d528d045f2d6;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: dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled. ACPI: don't walk tables if ACPI was disabled thermal: Create CONFIG_THERMAL_HWMON=n --- 0acbbee440fadf45164cc9537ee7d528d045f2d6