summaryrefslogtreecommitdiff
path: root/include/trace/events/xen.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-01-23 09:25:53 +1000
committerDave Airlie <airlied@redhat.com>2017-01-23 09:25:53 +1000
commit932790109f62aa52bdb4bb62aa66653c0b51bc75 (patch)
tree4bedb54f139d1e74637707eae2b04978a85243bf /include/trace/events/xen.h
parent2f39258e5744d34db5db27a1272fd41ac9d2397d (diff)
parentaf3076e67c31ceb3e314933dd61cb68a1d5120cf (diff)
Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes
drm-qemu: virtio sparse fix, MAINTAINERS updates. * tag 'drm-qemu-20170110' of git://git.kraxel.org/linux: drm: flip cirrus driver status to "obsolete". drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu) drm/virtio: fix framebuffer sparse warning
Diffstat (limited to 'include/trace/events/xen.h')
0 files changed, 0 insertions, 0 deletions
idth: 4.5%;'/> -rw-r--r--net/sched/sch_choke.c1
-rw-r--r--net/sched/sch_dsmark.c1
-rw-r--r--net/sched/sch_fq_codel.c1
-rw-r--r--net/sched/sch_htb.c1
-rw-r--r--net/sched/sch_ingress.c1
-rw-r--r--net/sched/sch_multiq.c2
-rw-r--r--net/sched/sch_prio.c2
-rw-r--r--net/sched/sch_sfb.c1
-rw-r--r--net/sched/sch_sfq.c1
13 files changed, 32 insertions, 24 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c