diff options
| author | Dave Airlie <[email protected]> | 2011-04-01 00:55:26 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2011-04-01 00:55:26 +0000 |
| commit | 61df611d5ed32ff785d1e4a0abc871b42a905c1e (patch) | |
| tree | daf6e4cdb9ccccf2e74ff824b6b95c14fc38ce25 /drivers/misc/ibmasm/module.c | |
| parent | drm: export drm_find_cea_extension to drivers (diff) | |
| parent | drm/i915: Reset GMBUS controller after NAK (diff) | |
| download | kernel-61df611d5ed32ff785d1e4a0abc871b42a905c1e.tar.gz kernel-61df611d5ed32ff785d1e4a0abc871b42a905c1e.zip | |
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
Diffstat (limited to 'drivers/misc/ibmasm/module.c')
0 files changed, 0 insertions, 0 deletions