From: Linus Torvalds Date: Mon, 15 Aug 2011 15:39:10 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e;p=~shefty%2Frdma-dev.git Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: don't try to be smart in the hpd handler drm/radeon: re-POST the asic on Apple hardware when booted via EFI drm/radeon: Allow panel preferred EDID to override BIOS native mode drm/radeon/kms: make some watermark messages debug only drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos drm/radeon/kms: don't enable connectors that are off in the hotplug handler --- 4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e