Upstream hash: 63ebf517fdd5aec6b3ca4f870d47d930c7d04ad5
Merge branch 'acpica'
Upstream hash: 637accd073a205eb4acac935f34d0eaee0c301a8
Merge branch 'acpica'