diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 09:07:03 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 09:07:03 +0100 |
commit | 877c357e7511395bc923ec9efc2e8b021a17ed79 (patch) | |
tree | 94c32b75a6ff1dff7c845abffb6ba8835e1230d8 /Documentation | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
parent | ACPI: Fix acpi_pm_device_sleep_state() (diff) | |
parent | ACPI: battery: add sysfs serial number (diff) | |
download | linux-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.xz linux-877c357e7511395bc923ec9efc2e8b021a17ed79.zip |
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release