]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 2 Oct 2015 00:35:22 +0000 (10:35 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 2 Oct 2015 00:35:22 +0000 (10:35 +1000)
radeon and amdgpu fixes for 4.3.
- backlight s/r fixes
- typo fix from Dan
- vm debugging fix
- remove import_gpu_mem after discussion with Daniel

* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: only print meaningful VM faults
  drm/amdgpu/cgs: remove import_gpu_mem
  drm/amdgpu:  Restore LCD backlight level on resume
  drm/radeon: Restore LCD backlight level on resume (>= R5xx)
  drm/amdgpu: signedness bug in amdgpu_cs_parser_init()


Trivial merge