| commit | 718cc664792c4ce436f221fe0e0a26a605308d4b | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Jun 24 10:16:37 2016 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Jun 24 10:16:37 2016 +1000 |
| tree | 8ef161170059e23358909366081b41a51d04aade | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e [diff] | |
| parent | 52dfcc5ccfbb6697ac3cac7f7ff1e712760e1216 [diff] |
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