Merge patches merged by Jani while I was on vacation.
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:15:44 +0000 (10:15 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:15:44 +0000 (10:15 +0200)
commitcfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb
tree06240ac00c9fee6a9ca97b778c63bfaa7ab6904d
parent34882298b93e998d5fccde852b860e8fbe6c8f6b
parent57127efaf1adc5e0bb2d3fa5a01bd97f71af7836
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>
drivers/gpu/drm/i915/i915_drv.h