| commit | bf6eb600e5b835a96d676b2b9df603362a1e714c | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Nov 03 09:17:08 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Nov 03 09:17:08 2017 +1000 |
| tree | 4d3b9c7e2bfcee6bfec7150f96a31622893a37b0 | |
| parent | 9ad472e337f830118bb589f756d2759f642228bb [diff] | |
| parent | d34ded7ece57782e75bf31bb145836b9f280750f [diff] |
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-next nouveau next fixes. Fixes arm32 build. * 'linux-4.15' of git://github.com/skeggsb/linux: drm/nouveau/bios/timing: mark expected switch fall-throughs drm/nouveau/devinit/nv04: mark expected switch fall-throughs drm/nouveau/bios: make const arrays hwsq_signature and edid_sig static drm/nouveau/core/memory: fix missing mutex unlock drm/nouveau/mmu: swap out round for ALIGN