commit | cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb | [log] [tgz] |
---|---|---|
author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jul 07 10:15:44 2014 +0200 |
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jul 07 10:15:44 2014 +0200 |
tree | 06240ac00c9fee6a9ca97b778c63bfaa7ab6904d | |
parent | 34882298b93e998d5fccde852b860e8fbe6c8f6b [diff] | |
parent | 57127efaf1adc5e0bb2d3fa5a01bd97f71af7836 [diff] |
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>