Upstream hash: a3f45e58b8b43aecdbed086b3a241695000fc5af
Merge branch 'acpica'