tree cbdb4d3f7fa97fd657f2e8e3489591dc444b9f23
parent 535e49f48e2fc95a6de8efb366ca8af35d424642
parent c4e6a2e64e948de42473e9c829181d768b1258c3
author Linus Torvalds <torvalds@linux-foundation.org> 1214767350 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1214767350 -0700

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