Merge branch 'acpica' into release
Len Brown [Wed, 23 Mar 2011 04:18:32 +0000 (00:18 -0400)]

Trivial merge