Dave Airlie 0bcb1d844a Merge branch 'drm-radeon-lockup' into drm-core-next ...

* drm-radeon-lockup:
  drm/radeon/kms: simplify & improve GPU reset V2
  drm/radeon/kms: rename gpu_reset to asic_reset
  drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4

Conflicts:
	drivers/gpu/drm/radeon/r300.c

2010-04-20 13:15:05 +10:00

..

drm

Merge branch 'drm-radeon-lockup' into drm-core-next

2010-04-20 13:15:05 +10:00

vga

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Makefile

…