[git pull] drm fixes

Dave Airlie
2015-06-05T02:39:01Z

Hi Linus,

just two small fixes, one radeon, one amdkfd.

Dave.

The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d:

Linux 4.1-rc6 (2015-05-31 19:01:07 -0700)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to e08f28fdda4ef0df5254d47ef44397c0f99d32ea:

Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes (2015-06-04 12:29:04 +1000)

----------------------------------------------------------------
Alex Deucher (1):
drm/radeon: use proper ACR regisiter for DCE3.2

Alexey Skidanov (1):
drm/amdkfd: fix topology bug with capability attr.

Dave Airlie (2):
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++--
drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)