From: Dave Airlie <airlied@redhat.com>
Date: Fri, 1 Apr 2016 03:13:34 +0000 (+1000)
Subject: Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.6-rc2~17^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f4fcb3eafd7e5d3e12f7e74093d2e8c43ef5eb6;p=platform%2Fkernel%2Flinux-exynos.git

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

Just a few fixes for 4.6 this week:
- Add some SI DPM quirks
- Improve the ACP Kconfig text
- Additional BO pinning checks

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Don't move pinned BOs
  drm/radeon: Don't move pinned BOs
  drm/radeon: add a dpm quirk for all R7 370 parts
  drm/radeon: add another R7 370 quirk
  drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
  drm/amd: Beef up ACP Kconfig menu text
---

2f4fcb3eafd7e5d3e12f7e74093d2e8c43ef5eb6