tree 2bf60eb8e66f9c98347838f5859f27356f65b25e
parent 0a63e2308cbbdc7e2f5645769afaf53785bcb9fa
parent 526b4af47f44148c9d665e57723ed9f86634c6e3
parent 932df7414336a00f45e5aec62724cf736b0bcfd4
parent 534bc4e3d27096e2f3fc00c14a20efd597837a4f
parent 28c2103dad04dba29ba86e22dad5735db8f0e13c
parent af986d101d141f10231ffa7e40ae397dc7356857
parent b299eb5cde1a91706c450804006c6559b0826df8
author Len Brown <len.brown@intel.com> 1306658328 -0400
committer Len Brown <len.brown@intel.com> 1306658328 -0400

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release