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)
commit718cc664792c4ce436f221fe0e0a26a605308d4b
tree8ef161170059e23358909366081b41a51d04aade
parent33688abb2802ff3a230bd2441f765477b94cc89e
parent52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216
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