Skip to content
Commit 718cc664 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 33688abb 52dfcc5c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment