projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eccaca2 7f58aab)
Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 1 Apr 2011 00:55:26 +0000 (10:55 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 1 Apr 2011 00:55:26 +0000 (10:55 +1000)
* 'keithp/drm-intel-fixes' of /ssd/git/drm-next:
  drm/i915: Reset GMBUS controller after NAK
  drm/i915: Busy-spin wait_for condition in atomic contexts
  drm/i915/lvds: Always return connected in the absence of better information


Trivial merge