commit | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 18:18:48 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 29 18:18:48 2011 -0700 |
tree | ef49dbbd1a38b4511c91108764740448f8744c39 | |
parent | 0e47427bc50bd34bd405e207ccf5235f3b78b551 [diff] | |
parent | b271a988eb9c3944c50fb62c21ac61860090d3ba [diff] |
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