projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf7934a 566d84d)
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)
* '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 patch | diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_state.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/radeon/radeon_drv.h
Simple merge
diff --cc drivers/gpu/drm/radeon/radeon_state.c
Simple merge
Domain: System / Kernel;