Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2011 02:43:06 +0000 (14:43 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2011 02:43:06 +0000 (14:43 +1200)
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
  drm/radeon/kms: fix dp_detect handling for DP bridge chips
  drm/radeon/kms: retry aux transactions if there are status flags


Trivial merge