Merge branch 'acpi-idle' into release
authorLen Brown <len.brown@intel.com>
Fri, 4 Jun 2010 19:23:02 +0000 (15:23 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 4 Jun 2010 19:23:02 +0000 (15:23 -0400)

Trivial merge