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)
commit814f695135f21aadeba77a3114df505d81a8d433
tree277da7e1c5dce9318591158435d2e367f3e495d3
parente51b3c8ff4bb88bc0f57473b7c3fe7fcd6b1a916
parentcfa21b22b43c7113107b5eb086b5f4d4ec36dc0a
Merge branch 'master' into r500-support
shared-core/radeon_cp.c
shared-core/radeon_drv.h