diff options
| author |   Keith Packard <keithp@keithp.com> | 2011-10-20 13:40:33 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-20 14:10:07 -0700 |
| commit | 86a3073e480c522f12e5291a462f68f6ee30aee3 (patch) | |
| tree | 5804f9d944084ff5245d07e8340779a4ecd52f9b /include/linux | |
| parent | Merge branch 'drm-intel-fixes' into drm-intel-next (diff) | |
| parent | drm/i915: No need to wait for eDP power off delay if panel is on (diff) | |
Merge branch 'edp-training-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Just whitespace change conflicts
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions