From: Dave Airlie Date: Mon, 1 Mar 2010 06:08:57 +0000 (+1000) Subject: Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage X-Git-Tag: v5.15~30514^2~10 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=68de7745822f0dc2eea940e3c1fc65896d7afc88;p=mirror_ubuntu-kernels.git 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 --- 68de7745822f0dc2eea940e3c1fc65896d7afc88