Merge branch 'acpi_enable' into release
authorLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:27 +0000 (16:17 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:27 +0000 (16:17 -0400)

Trivial merge