diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-15 13:25:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-15 13:25:58 +1000 |
| commit | 85d9e14cfde5393980c3dc29b9f3ef0d30424dfc (patch) | |
| tree | 2a0e91b5a10ecadaa96f82b29e79f8f9ef557ca9 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Linux 3.16-rc5 (diff) | |
| parent | drm/nouveau/therm: fix a potential deadlock in the therm monitoring code (diff) | |
| download | linux-85d9e14cfde5393980c3dc29b9f3ef0d30424dfc.tar.gz linux-85d9e14cfde5393980c3dc29b9f3ef0d30424dfc.zip | |
Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
deadlock fix.
* 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/therm: fix a potential deadlock in the therm monitoring code
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions