Merge branch 'acpi_enforce_resources' into release
Len Brown [Sun, 5 Apr 2009 05:50:46 +0000 (01:50 -0400)]

Trivial merge