From: Dave Airlie <airlied@redhat.com>
Date: Thu, 4 Jun 2015 02:28:41 +0000 (+1000)
Subject: Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.1-rc7~16^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0546b72b1da74937adec56bece7e3dded534e89a;p=linux-2.6-block.git

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

One more small r7xx audio regression fix for 4.1

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: use proper ACR regisiter for DCE3.2
---

0546b72b1da74937adec56bece7e3dded534e89a