From: Dave Airlie <airlied@redhat.com>
Date: Wed, 18 Oct 2017 22:09:57 +0000 (+1000)
Subject: Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.14-rc6~20^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a3a3d47935e0f31074c885b65c6869322e3e5044;p=linux.git

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
---

a3a3d47935e0f31074c885b65c6869322e3e5044