Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 19:05:53 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 19:05:53 +0000 (12:05 -0700)
commitf35f3dc4850d482143233fb51c714a81ce24083a
tree876d318d074f1a1e08203afc61ee6cbad78d11dd
parent0acf043e89afa5181c30cba4d7e0a92e913cb096
parentfdfc61594e6de21c23f955818ef78bcab9bafe40
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms: fix DDIA enable on some rs690 systems
  Revert "drm/radeon/kms: fix typo in r100_blit_copy"