From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 7 Jul 2014 08:15:44 +0000 (+0200)
Subject: Merge patches merged by Jani while I was on vacation.
X-Git-Tag: v3.17-rc1~82^2~49^2~86
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb;p=linux.git

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

cfb3c0ab0903abb6ea5215b37eebd9c2a1f057eb