Merge branch 'master' into r500-support
authorDave Airlie <airlied@linux.ie>
Mon, 10 Dec 2007 05:53:59 +0000 (15:53 +1000)
committerDave Airlie <airlied@linux.ie>
Mon, 10 Dec 2007 05:53:59 +0000 (15:53 +1000)
1  2 
shared-core/radeon_cp.c
shared-core/radeon_drv.h

Simple merge
Simple merge