diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-03 11:36:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-03 11:36:26 -0800 |
| commit | 4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7 (patch) | |
| tree | b46d6aa98fa52b2f7b7c6242f9a1c878371a260b /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (diff) | |
| parent | drm/i915: increase the tries for HDMI hotplug live status checking (diff) | |
| download | wireguard-linux-4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7.tar.xz wireguard-linux-4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7.zip | |
Merge tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel
Pull i915 drm fixes from Jani Nikula:
"Two display fixes still for v4.4.
The new year's resolution is to start using signed tags per Linus'
request. This one is still unsigned; I want to fix this up in our
maintainer scripts instead of doing it one-off"
* tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel:
drm/i915: increase the tries for HDMI hotplug live status checking
drm/i915: Unbreak check_digital_port_conflicts()
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions