From: Dave Airlie Date: Thu, 11 Feb 2010 04:03:51 +0000 (+1000) Subject: Merge branch 'drm-radeon-linus' of ../drm-next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a4583eb98af3fad7a8ab7d4915bd3ae179618c3;p=deliverable%2Flinux.git 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 --- 0a4583eb98af3fad7a8ab7d4915bd3ae179618c3