]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 2 Feb 2017 23:10:08 +0000 (09:10 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Feb 2017 23:10:08 +0000 (09:10 +1000)
two amd fixes.

* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Fix vram_size/visible values in DRM_RADEON_GEM_INFO ioctl
  drm/amdgpu/si: fix crash on headless asics


Trivial merge