Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2015 16:58:36 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2015 16:58:36 +0000 (09:58 -0700)
commit5943334737b0447f7f3e6268bd6c7da7c02f5948
treef58533b53e5decd3f2a7386e0c51ac455ed64fd4
parentdc2c6eb6f781b42c904ef3e90ea79f30afb68fe5
parente08f28fdda4ef0df5254d47ef44397c0f99d32ea
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