Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Tue, 25 Jul 2017 05:41:39 +0000 (15:41 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 25 Jul 2017 05:41:39 +0000 (15:41 +1000)
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


Trivial merge