aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/events/core.c
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 /kernel/events/core.c
parentMerge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff)
parentdrm/msm: use drm_gem_dumb_destroy helper (diff)
downloadlinux-dev-665441791f553221901f679cb47236798f9a649c.tar.xz
linux-dev-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 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions