| commit | 022d1a2942e072937f42bd3447e0059c220de58e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Nov 09 13:29:07 2012 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Nov 09 13:29:07 2012 +1000 |
| tree | 1afe96ef35e1162037e2360ba497a960e118b06b | |
| parent | 695ddeb457584a602f2ba117d08ce37cf6ec1589 [diff] | |
| parent | f418b88aad0c42b4caf4d79a0cf8d14a5d0a2284 [diff] |
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