diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'drm-misc-next-fixes-2017-04-12' of git://anongit.freedesktop.org/g... (diff) | |
| parent | Linux 4.11-rc7 (diff) | |
| download | linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.gz linux-856ee92e8602bd86d34388ac08381c5cb3918756.zip | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions