diff options
author | 2012-01-30 08:56:41 -0800 | |
---|---|---|
committer | 2012-01-30 08:56:41 -0800 | |
commit | dfd07ec3fa42fb14c4e333747cb73903220c6e81 (patch) | |
tree | b203b9d7382e154051bdc0058efc1ba0e05575de /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
parent | vmwgfx: Fix assignment in vmw_framebuffer_create_handle (diff) | |
download | linux-dev-dfd07ec3fa42fb14c4e333747cb73903220c6e81.tar.xz linux-dev-dfd07ec3fa42fb14c4e333747cb73903220c6e81.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
vmwgfx: Fix assignment in vmw_framebuffer_create_handle
drm/radeon/kms: Fix device tree linkage of i2c buses
drm: Pass the real error code back during GEM bo initialisation
Revert "drm/i810: cleanup reclaim_buffers"
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions