Merge commit 'e81a0e77' into topic/soix

Need to have a baseline of drm-next + acpi-next to merge new cool SOix
features for 3.17. No conflicts, so won't cause trouble.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>