Merge commit '75d04a3773ecee617847de963ae4195d6aa74c28' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 May 2015 07:25:12 +0000 (09:25 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 May 2015 07:25:12 +0000 (09:25 +0200)
commit93a96c6f049d047bc196890fc4284eff15b3770f
tree0461f2fe4b0bd57cd60175633be7ef4026db0488
parentde4de566f84b87f4d5f8265b11932088adb19896
parent75d04a3773ecee617847de963ae4195d6aa74c28
Merge commit '75d04a3773ecee617847de963ae4195d6aa74c28' into drm-intel-next-queued

Pull in patches Jani applied while I was on vacation.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>