Upstream hash: 83cded84d7064243001e2ffb4337486702189568
Merge branch 'acpica'