| commit | 0acbbee440fadf45164cc9537ee7d528d045f2d6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 29 12:22:30 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 29 12:22:30 2008 -0700 |
| tree | cbdb4d3f7fa97fd657f2e8e3489591dc444b9f23 | |
| parent | 535e49f48e2fc95a6de8efb366ca8af35d424642 [diff] | |
| parent | c4e6a2e64e948de42473e9c829181d768b1258c3 [diff] |
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