From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Jun 2011 15:19:14 +0000 (-0700)
Subject: Merge branch 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0-rc3~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18367c0ec73671fbfea35f13ae52d39437c53eb5;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

* 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: disable hdmi audio by default
  drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu
  drm/radeon/kms: set family for use in parser.
---

18367c0ec73671fbfea35f13ae52d39437c53eb5