projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7640131 0bbca27)
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Mar 2016 00:19:23 +0000 (16:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Mar 2016 00:19:23 +0000 (16:19 -0800)
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


Trivial merge
John Crispins staging tree