Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:16:37 +0000 (10:16 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:16:37 +0000 (10:16 +1000)
* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau: fix for disabled fbdev emulation


Trivial merge