commit | 3ab0a0f91cca6a9988ef1544176cd7f2106ec722 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 11 16:19:23 2016 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 11 16:19:23 2016 -0800 |
tree | f118b15a42d82901bac0ef678a67dd84e79a622e | |
parent | 7640131032db9118a78af715ac77ba2debeeb17c [diff] | |
parent | 0bbca274a31c2366414d8d3f95e03d1c4674d93f [diff] |
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