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)
commitcfd10811080f5bb0592e21d0b197d445f133ba9e
tree3adc2e5840cd4d2d91bd6c910809edf4e8b679ce
parent739b000994b7c813e4cac56c077abd8f6b0ccaab
parent38bcb208f60924a031b9f809f7cd252ea4a94e5f
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