diff options
author | Len Brown <len.brown@intel.com> | 2009-02-22 04:01:43 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-02-22 04:01:43 +0100 |
commit | 5acfac5a6473b459ed38c0edf515be030f3b5874 (patch) | |
tree | edeb4d26043f6147d0451e313487482ed3391b8d /arch | |
parent | ACPI: EC: Add delay for slow MSI controller (diff) | |
parent | battery: don't assume we are fully charged when not charging or discharging (diff) | |
parent | ACPI: remove CONFIG_ACPI_SYSTEM (diff) | |
parent | x86_64: Fix S3 fail path (diff) | |
download | linux-5acfac5a6473b459ed38c0edf515be030f3b5874.tar.xz linux-5acfac5a6473b459ed38c0edf515be030f3b5874.zip |
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend' into release