tree 2300d4868fe521afa3478c8ced084a2611842605
parent 165b11bfe44a4c758fece6e5b1bd9dcb628d6b13
parent 22e2e86560c5fca6f9b9d078f221fcdab9947a5e
author Dave Airlie <airlied@redhat.com> 1428017335 +1000
committer Dave Airlie <airlied@redhat.com> 1428017335 +1000

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

Just two small fixes for radeon, both destined for stable.

* 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix wait in radeon_mn_invalidate_range_start
  drm/radeon: add extra check in radeon_ttm_tt_unpin_userptr