diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 10:11:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-23 10:11:12 -0800 |
| commit | 2bfd43d80679db786e4349dc4711e2075a66d46b (patch) | |
| tree | 6b232c45470d5d64b7a3e0bae3b89818cd17e016 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes (diff) | |
| download | wireguard-linux-2bfd43d80679db786e4349dc4711e2075a66d46b.tar.xz wireguard-linux-2bfd43d80679db786e4349dc4711e2075a66d46b.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Not much happening, should have dequeued this lot earlier.
One amdgpu, one nouveau and one exynos fix"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/exynos: atomic check only enabled crtc states
drm/nouveau/bios/fan: hardcode the fan mode to linear
drm/amdgpu: fix user fence handling
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions