OSDN Git Service

Merge branch 'master' into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 2 Nov 2007 15:07:36 +0000 (16:07 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 2 Nov 2007 15:07:36 +0000 (16:07 +0100)
commit9906c7e54bdb9fa172155eaa57b7e6c47ab01c58
treee6ee03061c11e7a82d64593e4ae03e5ebe00470e
parent629c8b0dbf975632473d848f60606baf309f2f3b
parent94c22c334948a49641f4a1fa84687f992e5cc5cb
Merge branch 'master' into modesetting-101
linux-core/drm_bo.c
linux-core/drm_objects.h
shared-core/radeon_cp.c
shared-core/radeon_drv.h