Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@gmail.com>
Thu, 20 Sep 2012 10:48:31 +0000 (20:48 +1000)
committerDave Airlie <airlied@gmail.com>
Thu, 20 Sep 2012 10:48:31 +0000 (20:48 +1000)
commit8d4f5cc8816ee41c3277f35a91bee681636c6ff1
tree5e717d2abd4e65e8c2a27f6c5ac1fd37ced9e5ff
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
parent2f1f4d9b60396d2df4cff829bd5376ffc8ed9a2c
Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

The pll fix ended up causing some regressions.  Drop it for 3.6.  I've
fixed it properly in 3.7, but the fix is too invasive for 3.6.

* 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon: rework pll selection (v3)"