From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jun 2011 01:18:48 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v3.0-rc6~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3.0.0-rc5-sk-00080-gca56a95;p=karo-tx-linux.git

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/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: increase rom size for atrm method
---

ca56a95eedcc95f8fea7b49c87565cd961d74fe2