From: Dave Airlie <airlied@redhat.com>
Date: Fri, 1 Apr 2011 00:55:26 +0000 (+1000)
Subject: Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes
X-Git-Tag: v2.6.39-rc2~8^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61df611d5ed32ff785d1e4a0abc871b42a905c1e;p=karo-tx-linux.git

Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes

* '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
---

61df611d5ed32ff785d1e4a0abc871b42a905c1e