| commit | 86a3073e480c522f12e5291a462f68f6ee30aee3 | [log] [tgz] |
|---|---|---|
| author | Keith Packard <keithp@keithp.com> | Thu Oct 20 13:40:33 2011 -0700 |
| committer | Keith Packard <keithp@keithp.com> | Thu Oct 20 14:10:07 2011 -0700 |
| tree | 5804f9d944084ff5245d07e8340779a4ecd52f9b | |
| parent | 0ac225e56997ef89f46eb51b02799a685b78f214 [diff] | |
| parent | 32ce697c53f41290c3a2d3807b521b0fe4f42d2a [diff] |
Merge branch 'edp-training-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_dp.c Just whitespace change conflicts