diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:03 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:03 -0500 |
| commit | 877c357e7511395bc923ec9efc2e8b021a17ed79 (patch) | |
| tree | 94c32b75a6ff1dff7c845abffb6ba8835e1230d8 /drivers/acpi/sleep | |
| parent | 488b5ec871191359b9b79262a3d48456dae7ea5f (diff) | |
| parent | ad3399c378993152f12c23304ee56d7f9108e758 (diff) | |
| parent | 7c2670bbb53820d0a4fab8d74593eeccd1eef225 (diff) | |
| download | linux-3.10-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.gz linux-3.10-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.bz2 linux-3.10-877c357e7511395bc923ec9efc2e8b021a17ed79.zip | |
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release