diff options
author | Dave Airlie <airlied@redhat.com> | 2012-11-09 07:29:07 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-09 07:29:07 +0400 |
commit | 022d1a2942e072937f42bd3447e0059c220de58e (patch) | |
tree | 1afe96ef35e1162037e2360ba497a960e118b06b /net/mac80211/rx.c | |
parent | 695ddeb457584a602f2ba117d08ce37cf6ec1589 (diff) | |
parent | f418b88aad0c42b4caf4d79a0cf8d14a5d0a2284 (diff) | |
download | linux-022d1a2942e072937f42bd3447e0059c220de58e.tar.xz |
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
Diffstat (limited to 'net/mac80211/rx.c')
0 files changed, 0 insertions, 0 deletions