diff options
author | 2013-06-21 06:33:06 -1000 | |
---|---|---|
committer | 2013-06-21 06:33:06 -1000 | |
commit | e61cd5e2e36746e5a4e791b9232aed39bce52ded (patch) | |
tree | 9a9ba4b291698f94e00aaedbe6e4c551d7a51f5a /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'acpi-3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
parent | Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
download | wireguard-linux-e61cd5e2e36746e5a4e791b9232aed39bce52ded.tar.xz wireguard-linux-e61cd5e2e36746e5a4e791b9232aed39bce52ded.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm radeon fixes from Dave Airlie:
"One core fix, but mostly radeon fixes for s/r and big endian UVD
support, and a fix to stop the GPU being reset for no good reason, and
crashing people's machines."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: update lockup tracking when scheduling in empty ring
drm/prime: Honor requested file flags when exporting a buffer
drm/radeon: fix UVD on big endian
drm/radeon: fix write back suspend regression with uvd v2
drm/radeon: do not try to uselessly update virtual memory pagetable
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions