Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 3 insertions, 2 deletions

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 60edf9be31e5..d94684b7ba34 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -65,7 +65,7 @@ enum drm_mode_status {
     MODE_H_ILLEGAL,     /* mode has illegal horizontal timings */
     MODE_V_ILLEGAL,     /* mode has illegal horizontal timings */
     MODE_BAD_WIDTH,     /* requires an unsupported linepitch */
-    MODE_NOMODE,        /* no mode with a maching name */
+    MODE_NOMODE,        /* no mode with a matching name */
     MODE_NO_INTERLACE,  /* interlaced mode not supported */
     MODE_NO_DBLESCAN,   /* doublescan mode not supported */
     MODE_NO_VSCAN,      /* multiscan mode not supported */
@@ -321,7 +321,7 @@ struct drm_crtc_funcs {
 
         /*
          * Flip to the given framebuffer.  This implements the page
-         * flip ioctl descibed in drm_mode.h, specifically, the
+         * flip ioctl described in drm_mode.h, specifically, the
          * implementation must return immediately and block all
          * rendering to the current fb until the flip has completed.
          * If userspace set the event flag in the ioctl, the event
@@ -778,6 +778,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
                                     void *data, struct drm_file *file_priv);
 extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
                                     void *data, struct drm_file *file_priv);
+extern u8 *drm_find_cea_extension(struct edid *edid);
 extern bool drm_detect_hdmi_monitor(struct edid *edid);
 extern bool drm_detect_monitor_audio(struct edid *edid);
 extern int drm_mode_page_flip_ioctl(struct drm_device *dev,