From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Jun 2011 02:09:17 +0000 (-0700)
Subject: Merge branch 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0-rc3~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12871a0bd67dd4db4418e1daafcd46e9d329ef10;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'drm-radeon-fixes' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms/atom: fix PHY init
  drm/radeon/kms: add missing Evergreen texture formats to the CS parser
  drm/radeon/kms: viewport height has to be even
  drm/radeon/kms: remove duplicate reg from r600 safe regs
  drm/radeon/kms: add support for Llano Fusion APUs
  drm/radeon/kms: add llano pci ids
  drm/radeon/kms: fill in asic struct for llano
  drm/radeon/kms: add family ids for llano APUs
  drm/radeon: fix oops in ttm reserve when pageflipping (v2)
  drm/radeon/kms: clean up the radeon kms Kconfig
  drm/radeon/kms: fix thermal sensor reading on juniper
  drm/radeon/kms: add missing case for cayman thermal sensor
  drm/radeon/kms: add blit support for cayman (v2)
  drm/radeon/kms/blit: workaround some hw issues on evergreen+
---

12871a0bd67dd4db4418e1daafcd46e9d329ef10