Merge branch 'acpi-idle' into release
Len Brown [Fri, 4 Jun 2010 19:23:02 +0000 (15:23 -0400)]

Trivial merge