summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLen Brown2008-02-07 09:07:03 +0100
committerLen Brown2008-02-07 09:07:03 +0100
commit877c357e7511395bc923ec9efc2e8b021a17ed79 (patch)
tree94c32b75a6ff1dff7c845abffb6ba8835e1230d8 /include/linux
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff)
parentACPI: Fix acpi_pm_device_sleep_state() (diff)
parentACPI: battery: add sysfs serial number (diff)
downloadkernel-qcow2-linux-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.gz
kernel-qcow2-linux-877c357e7511395bc923ec9efc2e8b021a17ed79.tar.xz
kernel-qcow2-linux-877c357e7511395bc923ec9efc2e8b021a17ed79.zip
Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release