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)
* '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


Trivial merge