diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
| commit | 64282ea2d2a90437c0739ce016b80a1dec16507e (patch) | |
| tree | f1d484bb588a0739fda81db193325cf0c0d553ea /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | Revert "drm/i915: Add heuristic to determine better way to adjust brightness" (diff) | |
| parent | drm: linux-next: build failure after merge of the drm-misc tree (diff) | |
| download | linux-64282ea2d2a90437c0739ce016b80a1dec16507e.tar.gz linux-64282ea2d2a90437c0739ce016b80a1dec16507e.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions