Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
commit51ea8a88aae425915b458bfe295f1f10a3d52781
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Oct 2010 17:10:20 +0000 (19 10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Oct 2010 17:10:20 +0000 (19 10:10 -0700)
treee991da2ebc93660d18407775983c79c1181bbfe1
parent547af560ddbfe469ada2cad3009cbcfde313d73c
parent6a2a11dbea5db417d200d38dda53c30a2e5603e0
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: avivo cursor workaround applies to evergreen as well