Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 9 Nov 2012 03:29:07 +0000 (13:29 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 9 Nov 2012 03:29:07 +0000 (13:29 +1000)
commit022d1a2942e072937f42bd3447e0059c220de58e
tree1afe96ef35e1162037e2360ba497a960e118b06b
parent695ddeb457584a602f2ba117d08ce37cf6ec1589
parentf418b88aad0c42b4caf4d79a0cf8d14a5d0a2284
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Just some minor fixes for VM reg check and a regression fix for dce3 plls

* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/si: add some missing regs to the VM reg checker
  drm/radeon/cayman: add some missing regs to the VM reg checker
  drm/radeon/dce3: switch back to old pll allocation order for discrete