Merge branch 'origin' into radeon-ttm
authorDave Airlie <airlied@nx6125b.(none)>
Tue, 5 Jun 2007 00:09:11 +0000 (10:09 +1000)
committerDave Airlie <airlied@nx6125b.(none)>
Tue, 5 Jun 2007 00:09:11 +0000 (10:09 +1000)
commit07345af838a7443d29d12cb3fe91614e43c4fa81
tree9a16e9ea79c70c6aea65ac11e395dfbf83459453
parent704ca0638977f58742a8bff6aba9905fe862cfb3
parent4327d7f3142cdbf3f3f94426ae33e2d30b5a40c8
Merge branch 'origin' into radeon-ttm

Conflicts:

shared-core/radeon_drv.h
linux-core/ati_pcigart.c
linux-core/drmP.h
linux-core/radeon_drv.c
shared-core/radeon_cp.c
shared-core/radeon_drm.h
shared-core/radeon_drv.h
shared-core/radeon_irq.c