summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-09-29 10:06:28 +1000
committerDave Airlie <airlied@redhat.com>2013-09-29 10:06:28 +1000
commit665441791f553221901f679cb47236798f9a649c (patch)
tree61bfdcb9d9137a98bb86de16ca4c348b536b960c /Makefile
parent41ed7fe92f17ab8d29e9c6ccf0679ba522552992 (diff)
parent30600a9092dc44694fbb4d0c3fa796e977fd5c96 (diff)
downloadlwn-665441791f553221901f679cb47236798f9a649c.tar.gz
lwn-665441791f553221901f679cb47236798f9a649c.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions