diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-02-10 23:03:51 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-10 23:03:51 -0500 |
| commit | 0a4583eb98af3fad7a8ab7d4915bd3ae179618c3 (patch) | |
| tree | c14bad8e3bbfc68a54481a087fe9c13cbb4cd521 /drivers/ata/sata_sis.c | |
| parent | e8a47c10b20ee446e7badd0ec5625d0bdc4216b1 (diff) | |
| parent | 648ac05c4f8a8aea908c7dff81ceffe003e28561 (diff) | |
Merge branch 'drm-radeon-linus' of ../drm-next
* 'drm-radeon-linus' of ../drm-next:
drm/radeon/kms: retry auxch on 0x20 timeout value.
drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine.
drm/radeon/kms: fix screen clearing before fbcon.
drm/radeon/kms: add quirk for VGA without DDC on rv730 XFX card.
drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector.
drm/radeon/kms: change Kconfig text to reflect the new option.
drm/radeon/kms: suspend and resume audio stuff
Diffstat (limited to 'drivers/ata/sata_sis.c')
0 files changed, 0 insertions, 0 deletions