diff options
author | 2017-05-19 10:21:41 +1000 | |
---|---|---|
committer | 2017-05-19 10:21:41 +1000 | |
commit | e62961262141bd94341ae0dcb75d16a38542cc99 (patch) | |
tree | d7157e901bf6c51f7b68dfbcb0836f5f55043968 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'drm-misc-fixes-2017-05-18' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes (diff) | |
parent | drm/nouveau/fifo/gk104-: Silence a locking warning (diff) | |
download | wireguard-linux-e62961262141bd94341ae0dcb75d16a38542cc99.tar.xz wireguard-linux-e62961262141bd94341ae0dcb75d16a38542cc99.zip |
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes
misc nouveau fixes.
* 'linux-4.12' of git://github.com/skeggsb/linux:
drm/nouveau/fifo/gk104-: Silence a locking warning
drm/nouveau/secboot: plug memory leak in ls_ucode_img_load_gr() error path
drm/nouveau: Fix drm poll_helper handling
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions