aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:07:03 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:07:03 -0500
commit877c357e7511395bc923ec9efc2e8b021a17ed79 (patch)
tree94c32b75a6ff1dff7c845abffb6ba8835e1230d8 /drivers/acpi
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (diff)
parentACPI: Fix acpi_pm_device_sleep_state() (diff)
parentACPI: battery: add sysfs serial number (diff)
downloadlinux-dev-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.xz
linux-dev-877c357e7511395bc923ec9efc2e8b021a17ed79.zip
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release