Merge branch 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux into...
authorDave Airlie <airlied@redhat.com>
Wed, 4 Mar 2015 23:36:27 +0000 (09:36 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 Mar 2015 23:36:27 +0000 (09:36 +1000)
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"


Trivial merge