Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 01:18:48 +0000 (18:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 01:18:48 +0000 (18:18 -0700)
commitca56a95eedcc95f8fea7b49c87565cd961d74fe2
treeef49dbbd1a38b4511c91108764740448f8744c39
parent0e47427bc50bd34bd405e207ccf5235f3b78b551
parentb271a988eb9c3944c50fb62c21ac61860090d3ba
Merge branch 'drm-fixes' of git://git./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