Merge branch 'acpi_pad' into release
authorLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:52:19 +0000 (00:52 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:52:19 +0000 (00:52 -0400)

Trivial merge