Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn...
authorLen Brown <len.brown@intel.com>
Tue, 7 Apr 2009 22:18:42 +0000 (18:18 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 7 Apr 2009 22:18:42 +0000 (18:18 -0400)
commit8897c1859521cf33077256725b2377164b130c75
treee49377da09901fbfec673cfde759aad7fcaf9ab7
parent18b2646fe3babeb40b34a0c1751e0bf5adfdc64c
parentdb954b5898dd3ef3ef93f4144158ea8f97deb058
parentfdbdc7fc79c02ae4ede869d514179a2c65633d28
parent13614e37e94da4606a300ee6fe25c8c4a19ee670
parent33b571501553ceb008c0aef8b89e932d4efda2a2
parentf61bb93927fbc2933abe870813daba9d331aa121
Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn.notify' into release
drivers/acpi/thermal.c
drivers/platform/x86/panasonic-laptop.c