Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold...
authorLen Brown <len.brown@intel.com>
Sun, 29 May 2011 08:38:48 +0000 (04:38 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 29 May 2011 08:38:48 +0000 (04:38 -0400)

Trivial merge