tree 8ee06f4ee466b58fc224a7d447dd90a1168896e0
parent cf7934a2a0ec55759fcf6861a868baadfd522300
parent 566d84d172161cb6c0c4dd834c34abbac6bf7b38
author Dave Airlie <airlied@redhat.com> 1267423737 +1000
committer Dave Airlie <airlied@redhat.com> 1267423737 +1000

Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage

* 'drm-radeon-testing' of /ssd/git/drm-radeon-next:
  drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
  drm/ttm: fix function prototype to match implementation
  drm/radeon: use ALIGN instead of open coding it
  drm/radeon/kms: initialize set_surface_reg reg for rs600 asic