Merge branch 'acpica' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:27:39 +0000 (22:27 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 03:27:39 +0000 (22:27 -0500)

Trivial merge