From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Mar 2010 01:08:56 +0000 (+1000)
Subject: Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus
X-Git-Tag: v2.6.34-rc4~12^2~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fc59eda33e55f8787901e3501d695bf5ecec48b;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'radeon-for-airlied' of ../linux-2.6 into drm-linus

* 'radeon-for-airlied' of ../linux-2.6:
  drm/radeon/kms: prepare for more reclocking operations
  drm/radeon/kms: switch to condition waiting for reclocking
  drm/radeon/r600: add missing license and comments to r600_blit_shaders.c
  drm/radeon/kms: improve coding style a little
  drm/radeon/kms: remove dead audio/HDMI code
  drm/radeon/kms: enable audio engine on DCE32
  drm/radeon/kms: add HDMI code for pre-DCE3 R6xx GPUs
  drm/radeon/kms: clean assigning HDMI blocks to encoders
  drm/radeon/kms: clean HDMI definitions
  drm/radeon/kms/rs4xx: make sure crtcs are enabled when setting timing
  drm/radeon/kms/r1xx: enable hw i2c
  drm/radeon/kms: fix i2c prescale calc on older radeons
  drm/radeon/kms: fix for hw i2c
  drm/radeon/kms: fix pal tv-out support on legacy IGP chips
  drm/radeon/kms: further spread spectrum fixes
  drm/radeon/kms: use lcd pll limits when available
  drm/radeon/kms/atom: spread spectrum fix
  drm/radeon/kms: catch atombios infinite loop and break out of it
  drm/radeon: add new RS880 pci id
---

1fc59eda33e55f8787901e3501d695bf5ecec48b