Merge tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 23:09:29 +0000 (16:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 23:09:29 +0000 (16:09 -0700)
commit5c65e7be4cbb015e39759275746f31bb6fa74f77
treec433c3d1afed1a7bbf5531a052f9202804198c1d
parent5fc835284d45a10a181b5c3f149a701e0391d1b2
parente24ff467e12e1560de753313976c46e84fa6306a
Merge tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel

Pull drm EDID fix from Daniel Vetter:
 "Since Dave is enjoying vacation I figured I'll send you this drm core
  fix directly"

* tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel:
  drm/crtc: Fix edid length computation