Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Oct 2011 13:43:24 +0000 (06:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Oct 2011 13:43:24 +0000 (06:43 -0700)
commitf91f6cfd4f9ea794dc3d0bbd54cb1d29d6ef3843
treeec531f550473c5b7502a0b43dbc5d2736c68bd1a
parentbcd5cff7216f9b2de0a148cc355eac199dc6f1cf
parent5a6e8482a16e61250a9121fc9ec719ab0529e760
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