From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 Jun 2016 00:16:37 +0000 (+1000)
Subject: Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=718cc664792c4ce436f221fe0e0a26a605308d4b;p=linux.git

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

* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau: fix for disabled fbdev emulation
---

718cc664792c4ce436f221fe0e0a26a605308d4b