diff options
author | 2016-01-07 13:06:35 -0800 | |
---|---|---|
committer | 2016-01-07 13:06:35 -0800 | |
commit | 02006f7a7a715af10974a30b7ad8e6ee340f954c (patch) | |
tree | b2b570b740e0f1e2ac5c754d955802d6584e20c6 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'iommu-fixes-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
parent | Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
download | linux-rng-02006f7a7a715af10974a30b7ad8e6ee340f954c.tar.xz linux-rng-02006f7a7a715af10974a30b7ad8e6ee340f954c.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm nouveau fix from Dave Airlie:
"Still not back to work, but I decided to forward this fix"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau/gr/nv40: fix oops in interrupt handler
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions