Upstream hash: 3cc4aaba0391c0a064f8cd724faba345546b3768
Merge branch 'acpica'