diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 09:18:04 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 09:18:04 +0100 |
| commit | 26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (patch) | |
| tree | 47799c181a82225e5ee9c566b2186224cde06251 /drivers/acpi/thermal.c | |
| parent | Merge branches 'release' and 'stats' into release (diff) | |
| parent | Merge branches 'release' and 'stats' into release (diff) | |
| parent | ACPI: fan: build fix for CONFIG_ACPI_PROCFS=n (diff) | |
| download | linux-26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7.tar.xz linux-26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7.zip | |
Merge branches 'release' and 'menlo' into release
Conflicts:
drivers/acpi/video.c
Signed-off-by: Len Brown <len.brown@intel.com>