diff options
author | 2010-02-18 15:09:12 +1000 | |
---|---|---|
committer | 2010-02-18 15:09:12 +1000 | |
commit | 6b15835282f9c6a023e2625455bfdb822bb9cc64 (patch) | |
tree | a15eece7611ed6b013317751d63839aad3f35653 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | drm/radeon/kms: fix bo's fence association (diff) | |
parent | drm/nouveau: Force TV encoder DPMS reinit after resume. (diff) | |
download | wireguard-linux-6b15835282f9c6a023e2625455bfdb822bb9cc64.tar.xz wireguard-linux-6b15835282f9c6a023e2625455bfdb822bb9cc64.zip |
Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-linus
* 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: Force TV encoder DPMS reinit after resume.
drm/nouveau: use mutex for vbios lock
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions