From: Dave Airlie <airlied@redhat.com>
Date: Tue, 3 Jan 2012 09:43:28 +0000 (+0000)
Subject: Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next
X-Git-Tag: v3.3-rc1~121^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7e8734ac3235efafd34819b27fbdf5417e6d60;p=pandora-kernel.git

Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next

This merges the evergreen HDMI audio support.

* 'drm-radeon-testing' of ../drm-radeon-next:
  drm/radeon/kms: define TMDS/LVTM HDMI enabling bits
  drm/radeon/kms: workaround invalid AVI infoframe checksum issue
  drm/radeon/kms: setup HDMI mode on Evergreen encoders
  drm/radeon/kms: support for audio on Evergreen
  drm/radeon/kms: minor HDMI audio cleanups
  drm/radeon/kms: do not force DVI mode on DCE4 if audio is on
ridge

Conflicts:
	drivers/gpu/drm/radeon/evergreen.c
---

7a7e8734ac3235efafd34819b27fbdf5417e6d60
Reading git-diff-tree failed