Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 25 Mar 2016 06:02:06 +0000 (16:02 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 25 Mar 2016 06:02:06 +0000 (16:02 +1000)
commit4604202ca8d2a5e33b4bca0812b5d92975ed1bd8
tree520ea356b99bf0e8b314bafd1f09d0967fb3cd0a
parent17efca93c8728445522dedafc033b3384a26a39d
parent1135035d9275ef9aecad23fc715a69ff78904adf
Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next

some amd fixes
* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/mst: cleanup code indentation
  drm/radeon/mst: fix regression in lane/link handling.
  drm/amdgpu: add invalidate_page callback for userptrs
  drm/amdgpu: Revert "remove the userptr rmn->lock"
  drm/amdgpu: clean up path handling for powerplay
  drm/amd/powerplay: fix memory leak of tdp_table