tree ec531f550473c5b7502a0b43dbc5d2736c68bd1a
parent bcd5cff7216f9b2de0a148cc355eac199dc6f1cf
parent 5a6e8482a16e61250a9121fc9ec719ab0529e760
author Linus Torvalds <torvalds@linux-foundation.org> 1319031804 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1319031804 -0700

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