Merge branch 'acpi_pm_device_sleep_state' into release
authorLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:12:46 +0000 (02:12 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:12:46 +0000 (02:12 -0400)
1  2 
include/acpi/acpi_bus.h

Simple merge