From: Dave Airlie <airlied@redhat.com>
Date: Tue, 25 Jul 2017 05:41:39 +0000 (+1000)
Subject: Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.13~197^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cfd10811080f5bb0592e21d0b197d445f133ba9e;p=mirror_ubuntu-artful-kernel.git

Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes

two more fixes for issues nouveau found in fedora 26.

* 'linux-4.13' of git://github.com/skeggsb/linux:
  drm/nouveau/bar/gf100: fix access to upper half of BAR2
  drm/nouveau/disp/nv50-: bump max chans to 21
---

cfd10811080f5bb0592e21d0b197d445f133ba9e