]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 22 May 2015 03:31:54 +0000 (13:31 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 22 May 2015 03:31:54 +0000 (13:31 +1000)
Just two small DP fixes for 4.1

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix error flag checking in native aux path
  drm/radeon: retry dcpd fetch


Trivial merge