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)
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>

Trivial merge