Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 18 Oct 2017 22:09:57 +0000 (08:09 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 18 Oct 2017 22:09:57 +0000 (08:09 +1000)
commita3a3d47935e0f31074c885b65c6869322e3e5044
treee4b71e46e667e4b17175229c6d688c7fca5bb32b
parent2de0307323fc42c6395d0eafec9879d55e042c85
parent4813766325374af6ed0b66879ba6a0bbb05c83b6
Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes

some nouveau fixes.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/fbcon: fix oops without fbdev emulation
  drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards
  drm/nouveau/bsp/g92: disable by default
  drm/nouveau/mmu: flush tlbs before deleting page tables