From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2015 16:58:36 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: firefly_0821_release~176^2~1688
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5943334737b0447f7f3e6268bd6c7da7c02f5948;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Just two small fixes: one radeon, one amdkfd"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/amdkfd: fix topology bug with capability attr.
  drm/radeon: use proper ACR regisiter for DCE3.2
---

5943334737b0447f7f3e6268bd6c7da7c02f5948