]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:39:10 +0000 (08:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Aug 2011 15:39:10 +0000 (08:39 -0700)
commit4cb5aa1d01c9794623df6a2320dcd6398cbe5e8e
tree018cf559ba38ab1b3c4430304c51cf7264fe0075
parentaa2b1cf5ca44811ab842c1cd8d32f95b8f51e557
parentd5811e8731213f80c80d89e980505052f16aca1c
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