From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 03:15:05 +0000 (+1000)
Subject: Merge branch 'drm-radeon-lockup' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcb1d844ac638a4c4280f697d5bfac9791e9a70;p=pandora-kernel.git

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
---

0bcb1d844ac638a4c4280f697d5bfac9791e9a70
Reading git-diff-tree failed