diff options
author | 2015-08-08 04:18:14 +0300 | |
---|---|---|
committer | 2015-08-08 04:18:14 +0300 | |
commit | 981dae742bc67ccd078bab0affdfb5eb78fc5697 (patch) | |
tree | 1a5cd353ef439920a4a7c15b26541429df99e749 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
parent | drm/vblank: Use u32 consistently for vblank counters (diff) | |
download | linux-dev-981dae742bc67ccd078bab0affdfb5eb78fc5697.tar.xz linux-dev-981dae742bc67ccd078bab0affdfb5eb78fc5697.zip |
Merge tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel
Pull drm fixes from Daniel Vetter:
"One i915 regression fix and a drm core one since Dave's not around,
both introduced in 4.2 so not cc: stable.
The fix for the warning Ted reported isn't in here yet since he didn't
yet supply a tested-by and I can't repro this one myself (it's in
fixup code that needs firmware doing something i915 wouldn't do)"
* tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel:
drm/vblank: Use u32 consistently for vblank counters
drm/i915: Allow parsing of variable size child device entries from VBT
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions