tree 06240ac00c9fee6a9ca97b778c63bfaa7ab6904d
parent 34882298b93e998d5fccde852b860e8fbe6c8f6b
parent 57127efaf1adc5e0bb2d3fa5a01bd97f71af7836
author Daniel Vetter <daniel.vetter@ffwll.ch> 1404720944 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1404720944 +0200

Merge patches merged by Jani while I was on vacation.

Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.

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