From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Oct 2011 02:43:06 +0000 (+1200)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.1-rc10~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84c861161404658c866835bf9ca07eb487added8;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

84c861161404658c866835bf9ca07eb487added8