Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Thu, 4 Jun 2015 02:29:04 +0000 (12:29 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 4 Jun 2015 02:29:04 +0000 (12:29 +1000)
commite08f28fdda4ef0df5254d47ef44397c0f99d32ea
tree9c0db84595ee091784bb5f894244f5cfda9ba6cb
parent0546b72b1da74937adec56bece7e3dded534e89a
parent826f5de84ceb6f96306ce4081b75a0539d8edd00
Merge tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

One minor fix for last -rc of 4.1. The fix moves the update of an attribute in
topology to *after* it is actually initialized.

* tag 'drm-amdkfd-fixes-2015-06-03' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: fix topology bug with capability attr.