| commit | 665441791f553221901f679cb47236798f9a649c | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Sun Sep 29 10:06:28 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Sun Sep 29 10:06:28 2013 +1000 |
| tree | 61bfdcb9d9137a98bb86de16ca4c348b536b960c | |
| parent | 41ed7fe92f17ab8d29e9c6ccf0679ba522552992 [diff] | |
| parent | 30600a9092dc44694fbb4d0c3fa796e977fd5c96 [diff] |
Merge branch 'msm-fixes-3.12-rc2' of git://people.freedesktop.org/~robclark/linux into drm-fixes A small fix + deal with fallout of iommu changes + use new drm_gem_dumb_destroy helper. * 'msm-fixes-3.12-rc2' of git://people.freedesktop.org/~robclark/linux: drm/msm: use drm_gem_dumb_destroy helper drm/msm: deal with mach/iommu.h removal drm/msm: Remove iommu include from mdp4_kms.c drm/msm: Odd PTR_ERR usage