diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-10 10:55:35 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-10 10:55:35 +0100 |
| commit | eb84f976c88d72cbcbe756df38d1f19be3db77d6 (patch) | |
| tree | db3ff3b5edc305a0352b69327b914ef3a92e05a5 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 69f627f56fac212c1e49cd0d285e3f8cd264dd0c (diff) | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff) | |
| download | blackbird-op-linux-eb84f976c88d72cbcbe756df38d1f19be3db77d6.tar.gz blackbird-op-linux-eb84f976c88d72cbcbe756df38d1f19be3db77d6.zip | |
Merge remote-tracking branch 'airlied/drm-next' into HEAD
Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index b250d96ab7a1..d43fa0e627f8 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -672,7 +672,7 @@ enum punit_power_well { * need to be accessed during AUX communication, * * Generally the common lane corresponds to the pipe and - * the spline (PCS/TX) correponds to the port. + * the spline (PCS/TX) corresponds to the port. * * For dual channel PHY (VLV/CHV): * |
