From: Linus Torvalds Date: Sat, 8 Aug 2015 01:18:14 +0000 (+0300) Subject: Merge tag 'drm-intel-fixes-2015-08-07' of git://anongit.freedesktop.org/drm-intel X-Git-Tag: omap-for-v4.3/fixes-merge-window~131 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=981dae742bc67ccd078bab0affdfb5eb78fc5697;p=pandora-kernel.git 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 --- 981dae742bc67ccd078bab0affdfb5eb78fc5697 Reading git-diff-tree failed