Merge branch 'acpi_pad' into release

This commit is contained in:
Len Brown 2010-06-12 00:52:19 -04:00
commit a48ecc7718