Merge tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2015 01:18:14 +0000 (04:18 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2015 01:18:14 +0000 (04:18 +0300)
commit981dae742bc67ccd078bab0affdfb5eb78fc5697
tree1a5cd353ef439920a4a7c15b26541429df99e749
parent49d7c6559bf2ab4f1d56be131ab9571a51fc71bd
parent209e4dbc8dcdb2b1839f18fd1cf07ec7bedadf4d
Merge tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel

Pull drm fixes from Daniel Vetter:
 "One i915 regression fix and a drm core one since Dave's not around,
  both introduced in 4.2 so not cc: stable.

  The fix for the warning Ted reported isn't in here yet since he didn't
  yet supply a tested-by and I can't repro this one myself (it's in
  fixup code that needs firmware doing something i915 wouldn't do)"

* tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel:
  drm/vblank: Use u32 consistently for vblank counters
  drm/i915: Allow parsing of variable size child device entries from VBT