Upstream hash: a9d8bd031d2cc95f4d19f8ca299ce6b6adcf991e
Upstream hash: c0e2cf9b53a9b0029877e5f1b1a48ac66d139085
Merge branch 'acpica'