diff options
author | 2010-02-18 08:10:21 -0800 | |
---|---|---|
committer | 2010-02-18 08:10:21 -0800 | |
commit | 86404ab60df2ea65f39be936fc11762b642810c3 (patch) | |
tree | 9834aa4ba93dbdb398d007eaba639f27148d4bdf /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
parent | Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-linus (diff) | |
download | wireguard-linux-86404ab60df2ea65f39be936fc11762b642810c3.tar.xz wireguard-linux-86404ab60df2ea65f39be936fc11762b642810c3.zip |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: fix bo's fence association
drm/radeon/kms: fix indirect buffer management V2
drm/edid: Fix interlaced detailed timings to be frame size, not field.
drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
drm/radeon/kms: use udelay for short delays
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