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/drm_modes.c | |
| parent | 69f627f56fac212c1e49cd0d285e3f8cd264dd0c (diff) | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff) | |
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/drm_modes.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index d1b7d200652..6d8b941c820 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -914,7 +914,7 @@ EXPORT_SYMBOL(drm_mode_equal_no_clocks_no_stereo); * * This function is a helper which can be used to validate modes against size * limitations of the DRM device/connector. If a mode is too big its status - * memeber is updated with the appropriate validation failure code. The list + * member is updated with the appropriate validation failure code. The list * itself is not changed. */ void drm_mode_validate_size(struct drm_device *dev, |