Merge branch 'topic/core-stuff' into topic/atomic-core

Backmerge my drm-misc branch because of conflicts. Just simple stuff
but better to clear this out before I merge the other atomic patches.

Conflicts:
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_edid.c

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 86574b0005ff..aae71cb32123 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -338,7 +338,7 @@ struct drm_mode_fb_cmd2 {
 
         /*
          * In case of planar formats, this ioctl allows up to 4
-         * buffer objects with offets and pitches per plane.
+         * buffer objects with offsets and pitches per plane.
          * The pitch and offset order is dictated by the fourcc,
          * e.g. NV12 (http://fourcc.org/yuv.php#NV12) is described as:
          *
@@ -346,9 +346,9 @@ struct drm_mode_fb_cmd2 {
          *   followed by an interleaved U/V plane containing
          *   8 bit 2x2 subsampled colour difference samples.
          *
-         * So it would consist of Y as offset[0] and UV as
-         * offeset[1].  Note that offset[0] will generally
-         * be 0.
+         * So it would consist of Y as offsets[0] and UV as
+         * offsets[1].  Note that offsets[0] will generally
+         * be 0 (but this is not required).
          */
         __u32 handles[4];
         __u32 pitches[4]; /* pitch for each plane */