tree 2f2dcf8f3bb9001284b696462613868aa091caf4
parent 746fb63c54d2659e1da3c5e90a77ccb23a309cc5
parent cb7cf41961fe10773c491c75ae73539ad4bbed66
author Linus Torvalds <torvalds@linux-foundation.org> 1318214586 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318214586 +1200

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* '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