]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 19 Jun 2015 01:55:29 +0000 (11:55 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 Jun 2015 01:55:29 +0000 (11:55 +1000)
two radeon fixes
one MST fix,
one query addition, destined for stable, and to fix a regression
* 'drm-fixes-4.1' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: don't probe MST on hw we don't support it on
  drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query


Trivial merge