diff options
author | 2016-05-17 12:15:49 +0200 | |
---|---|---|
committer | 2016-05-17 12:15:49 +0200 | |
commit | 9a652cc01e589e10e2aa341074ea240c9838102b (patch) | |
tree | 48ec31db7a09a0e6b7cca66ea08b20cc78f218cb /tools/perf/scripts/python/export-to-postgresql.py | |
parent | drm/i915: don't mix bitwise and logical operations for has_snoop (diff) | |
parent | Merge tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
download | wireguard-linux-9a652cc01e589e10e2aa341074ea240c9838102b.tar.xz wireguard-linux-9a652cc01e589e10e2aa341074ea240c9838102b.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge request by Jani to get at
commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f
Author: Deepak M <m.deepak@intel.com>
Date: Wed Mar 30 17:03:39 2016 +0300
drm: Add new DCS commands in the enum list
Some simple conflicts in intel_dp.c.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions