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)
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


Trivial merge