Merge tag 'v3.16-rc4' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:17:56 +0000 (10:17 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:17:56 +0000 (10:17 +0200)
commitf1615bbe9be4def59c3b3eaddb60722efeed16c2
treeca3020e65447576fc1826e819651e6ba072030b5
parentcfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb
parentcd3de83f147601356395b57a8673e9c5ff1e59d1
Merge tag 'v3.16-rc4' into drm-intel-next-queued

Due to Dave's vacation drm-next hasn't opened yet for 3.17 so I
couldn't move my drm-intel-next queue forward yet like I usually do.
Just pull in the latest upstream -rc to unblock patch merging - I
don't want to needlessly rebase my current patch pile really and void
all the testing we've done already.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sprite.c