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)
commit6288cf1e768ae73db5ddaaae54d85245cc1c2b56
tree2bf60eb8e66f9c98347838f5859f27356f65b25e
parent0a63e2308cbbdc7e2f5645769afaf53785bcb9fa
parent526b4af47f44148c9d665e57723ed9f86634c6e3
parent932df7414336a00f45e5aec62724cf736b0bcfd4
parent534bc4e3d27096e2f3fc00c14a20efd597837a4f
parent28c2103dad04dba29ba86e22dad5735db8f0e13c
parentaf986d101d141f10231ffa7e40ae397dc7356857
parentb299eb5cde1a91706c450804006c6559b0826df8
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release
drivers/acpi/ec.c
drivers/acpi/osl.c
include/acpi/actypes.h