| commit | c4b3a81f4e053bb13382e0ffaf69f3e7e4f124fd | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Sun Nov 10 18:27:31 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Sun Nov 10 18:27:31 2013 +1000 |
| tree | 869f84216ce1cabcdd194d692f7fac8c4afe6b0e | |
| parent | 98706ea99f2da8afdac69686de4ff982aca6a5c7 [diff] | |
| parent | 2a2b8fa628a5069db1cc984d21a3048ffd485346 [diff] |
Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next 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