From: Daniel Vetter Date: Thu, 18 Jul 2013 10:03:29 +0000 (+0200) Subject: Merge tag 'v3.10' into drm-intel-fixes X-Git-Url: https://rtime.felk.cvut.cz/gitweb/linux-imx.git/commitdiff_plain/8157ee2115fc343ccdadab671e2b75e285feaa60 Merge tag 'v3.10' into drm-intel-fixes Backmerge Linux 3.10 to get at commit 19b2dbde5732170a03bd82cc8bd442cf88d856f7 Author: Chris Wilson Date: Wed Jun 12 10:15:12 2013 +0100 drm/i915: Restore fences after resume and GPU resets That commit is not in my current -fixes pile since that's based on my -next queue for 3.11. And the above mentioned fix was merged really late into 3.10 (and blew up, bad me) so was on a diverging branch. Option B would have been to rebase my current pile of fixes onto Dave's drm-fixes branch. But since some of the patches here are a bit tricky I've decided not to void all the testing by moving over the entire merge window. Signed-off-by: Daniel Vetter --- 8157ee2115fc343ccdadab671e2b75e285feaa60