Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:07:03 +0000 (03:07 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:07:03 +0000 (03:07 -0500)
1  2  3 
drivers/acpi/sleep/main.c

Simple merge