Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm...
authorDave Airlie <airlied@redhat.com>
Sun, 10 Nov 2013 08:27:31 +0000 (18:27 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 10 Nov 2013 08:27:31 +0000 (18:27 +1000)
prime support, inactive rework, render nodes
* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/mdp4: page_flip cleanups/fixes
  drm/msm: EBUSY status handling in msm_gem_fault()
  drm/msm: rework inactive-work
  drm/msm: add plane support
  drm/msm: resync generated headers
  drm/msm: support render nodes
  drm/msm: prime support


Trivial merge