From: Linus Torvalds Date: Sat, 12 Mar 2016 00:19:23 +0000 (-0800) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ab0a0f91cca6a9988ef1544176cd7f2106ec722;p=linux.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull drm/i915 fixes from Dave Airlie: "Just two i915 regression fixes, that should be it from me" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915: Actually retry with bit-banging after GMBUS timeout drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW --- 3ab0a0f91cca6a9988ef1544176cd7f2106ec722