]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage
authorDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:08:57 +0000 (16:08 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Mar 2010 06:08:57 +0000 (16:08 +1000)
commit716332fa69a0bdc0870417924a38ba9105f1a1d9
tree8ee06f4ee466b58fc224a7d447dd90a1168896e0
parent6e6e54392e4e89eaed79d97519a7b0f089b1db22
parentcd4cea4954979e730e9bffd433ea9efc09bc9b52
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
drivers/gpu/drm/radeon/radeon_drv.h
drivers/gpu/drm/radeon/radeon_state.c