Merge branch 'acpica-cherry-pick' into release
authorLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:56:15 +0000 (00:56 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jun 2010 04:56:15 +0000 (00:56 -0400)

Trivial merge