From: Dave Airlie Date: Wed, 4 Mar 2015 23:36:27 +0000 (+1000) Subject: Merge branch 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux into... X-Git-Tag: v4.0-rc3~10^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4afb1534775ffcea984ab63cf9cc217203318bfe;p=linux.git Merge branch 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux into drm-fixes Fixup some fallout of the fallout of atomic dpms, few mdp5 cursor fixes, fix a leak in error path, and some fixes for kexec * 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux: drm/msm: kexec fixes drm/msm/mdp5: fix cursor blending drm/msm/mdp5: fix cursor ROI drm/msm/atomic: Don't leak atomic commit object when commit fails drm/msm/mdp5: Avoid flushing registers when CRTC is disabled drm/msm: update generated headers (add 6th lm.base entry) drm/msm/mdp5: fixup "drm/msm: fix fallout of atomic dpms changes" --- 4afb1534775ffcea984ab63cf9cc217203318bfe