| commit | 61df611d5ed32ff785d1e4a0abc871b42a905c1e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Apr 01 10:55:26 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Apr 01 10:55:26 2011 +1000 |
| tree | daf6e4cdb9ccccf2e74ff824b6b95c14fc38ce25 | |
| parent | eccaca28e29861a63ebc067bfff59c7efa427371 [diff] | |
| parent | 7f58aabc369014fda3a4a33604ba0a1b63b941ac [diff] |
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