From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Oct 2011 13:43:24 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: upstream/snapshot3+hdmi~8968
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f91f6cfd4f9ea794dc3d0bbd54cb1d29d6ef3843;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms/atom: fix handling of FB scratch indices
  drm/radeon/kms/DCE4.1: fix Select_CrtcSource EncodeMode setting for DP bridges (v2)
  drm/radeon/kms/DCE4.1: ss is not supported on the internal pplls
  drm/radeon/kms/DCE4.1: fix dig encoder to transmitter mapping
  ttm: Fix error-path using an uninitialized value
---

f91f6cfd4f9ea794dc3d0bbd54cb1d29d6ef3843