From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 19:05:53 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~3680^2~4421
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f35f3dc4850d482143233fb51c714a81ce24083a;p=firefly-linux-kernel-4.4.55.git

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"
---

f35f3dc4850d482143233fb51c714a81ce24083a