From: Len Brown Date: Thu, 7 Feb 2008 08:07:03 +0000 (-0500) Subject: Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release X-Git-Tag: v2.6.25-rc1~297^2~3^2~2^2~1^2~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=877c357e7511395bc923ec9efc2e8b021a17ed79;p=linux-2.6-omap-h63xx.git Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release --- 877c357e7511395bc923ec9efc2e8b021a17ed79