diff --git a/[refs] b/[refs] index ff160ecf45f3..89c1d965d6e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce495960ff33f96362cf81f0eb7c52d1a89f64be +refs/heads/master: 13bcf01b33e6e19a7fe7ff396f9ed02803e225ec diff --git a/trunk/include/drm/drm_crtc.h b/trunk/include/drm/drm_crtc.h index 8839b3a24660..e3e0d651c6ca 100644 --- a/trunk/include/drm/drm_crtc.h +++ b/trunk/include/drm/drm_crtc.h @@ -443,12 +443,12 @@ struct drm_crtc { * @dpms: set power state (see drm_crtc_funcs above) * @save: save connector state * @restore: restore connector state - * @reset: reset connector after state has been invalidate (e.g. resume) + * @reset: reset connector after state has been invalidated (e.g. resume) * @detect: is this connector active? * @fill_modes: fill mode list for this connector - * @set_property: property for this connector may need update + * @set_property: property for this connector may need an update * @destroy: make object go away - * @force: notify the driver the connector is forced on + * @force: notify the driver that the connector is forced on * * Each CRTC may have one or more connectors attached to it. The functions * below allow the core DRM code to control connectors, enumerate available modes,