diff options
| author | Daniel Vetter | 2013-05-21 09:52:16 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-05-21 09:52:16 +0200 |
| commit | e1b73cba13a0cc68dd4f746eced15bd6bb24cda4 (patch) | |
| tree | b1c9e10730724024a700031ad56c20419dabb500 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | drm/i915: add support for dvo Chrontel 7010B (diff) | |
| parent | Linux 3.10-rc2 (diff) | |
| download | kernel-qcow2-linux-e1b73cba13a0cc68dd4f746eced15bd6bb24cda4.tar.gz kernel-qcow2-linux-e1b73cba13a0cc68dd4f746eced15bd6bb24cda4.tar.xz kernel-qcow2-linux-e1b73cba13a0cc68dd4f746eced15bd6bb24cda4.zip | |
Merge tag 'v3.10-rc2' into drm-intel-next-queued
Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
grew a bit out of hand. intel_dp.c has the only real functional
conflict since the logic changed while dev_priv->edp.bpp was moved
around.
Also squash in a whitespace fixup from Ben Widawsky for
i915_gem_gtt.c, git seems to do something pretty strange in there
(which I don't fully understand tbh).
Conflicts:
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_dp.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
0 files changed, 0 insertions, 0 deletions