Upstream hash: 2aabe5745612a7649bcf3c3a48f6d9067ca5d0bd
Merge branch 'acpica'