tree 8ef161170059e23358909366081b41a51d04aade
parent 33688abb2802ff3a230bd2441f765477b94cc89e
parent 52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216
author Dave Airlie <airlied@redhat.com> 1466727397 +1000
committer Dave Airlie <airlied@redhat.com> 1466727397 +1000

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