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 /scripts | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (diff) | |
| parent | ACPI: Fix acpi_pm_device_sleep_state() (diff) | |
| parent | ACPI: battery: add sysfs serial number (diff) | |
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release