summaryrefslogtreecommitdiff
path: root/include/trace/events
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-01-23 09:13:45 +1000
committerDave Airlie <airlied@redhat.com>2017-01-23 09:13:45 +1000
commitb310348530c44bcfe98ea29c97274562853b4583 (patch)
tree683616cb88f965e99f1ad0f7217cde8e1e722f6f /include/trace/events
parent78337c0697e669554c28b8b48c644bbaad0ffc5e (diff)
parentde85d2b35ac74f6be769573d4a8708c823219900 (diff)
Merge branch 'msm-fixes-4.10-rc4' of git://people.freedesktop.org/~robclark/linux into drm-fixes
* 'msm-fixes-4.10-rc4' of git://people.freedesktop.org/~robclark/linux: drm/msm: fix potential null ptr issue in non-iommu case drm/msm/mdp5: rip out plane->pending tracking
Diffstat (limited to 'include/trace/events')
0 files changed, 0 insertions, 0 deletions
an class='deletions'>-19/+26 2017-02-01Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds1-0/+1 2017-02-01Merge tag 'wireless-drivers-next-for-davem-2017-02-01' of git://git.kernel.or...David S. Miller2-1/+2 2017-02-01net: fix ndo_features_check/ndo_fix_features comment orderingDimitris Michailidis1-14/+15