Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage
Dave Airlie [Mon, 1 Mar 2010 06:08:57 +0000 (16:08 +1000)]
* '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

1  2 
drivers/gpu/drm/radeon/radeon_drv.h
drivers/gpu/drm/radeon/radeon_state.c

Simple merge
Simple merge