Merge branch 'acpica' into release
authorLen Brown <len.brown@intel.com>
Fri, 18 Mar 2011 22:06:08 +0000 (18:06 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 18 Mar 2011 22:06:08 +0000 (18:06 -0400)

Trivial merge