From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Mar 2016 00:51:51 +0000 (+1000)
Subject: Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=550e3b23a53c88adfa46e64f9d442743e65d47da;p=openwrt%2Fstaging%2Fblogic.git

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

Some more radeon and amdgpu stuff for drm-next.  Mostly just bug fixes
for new features and cleanups.

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: fix rb bitmap & cu bitmap calculation
  drm/amdgpu: trace the pd_addr in vm_grab_id as well
  drm/amdgpu: fix VM faults caused by vm_grab_id() v4
  drm/amdgpu: update radeon acpi header
  drm/radeon: update radeon acpi header
  drm/amd: cleanup get_mfd_cell_dev()
  drm/amdgpu: fix error handling in amdgpu_bo_list_set
  drm/amd/powerplay: fix code style warning.
  drm/amd: Do not make DRM_AMD_ACP default to y
  drm/amdgpu/gfx: fix off by one in rb rework (v2)
---

550e3b23a53c88adfa46e64f9d442743e65d47da