[git pull] drm fixes

[Dave Airlie]

Hi,

One radeon fix, and one serious radeon revert due to regression.

Dave.

The following changes since commit d942e43b58dc27b36305bcd374a74f7cc15183a3:

  Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security (2011-09-22 19:57:27 -0700)

are available in the git repository at:

  ssh://people.freedesktop.org/~/linux drm-fixes

Alex Deucher (1):
      drm/radeon/kms: fix DDIA enable on some rs690 systems

Dave Airlie (1):
      Revert "drm/radeon/kms: fix typo in r100_blit_copy"

 drivers/gpu/drm/radeon/r100.c            |    4 ++--
 drivers/gpu/drm/radeon/radeon_encoders.c |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)