projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ad472e d34ded7)
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 23:17:08 +0000 (09:17 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 23:17:08 +0000 (09:17 +1000)
commitbf6eb600e5b835a96d676b2b9df603362a1e714c
tree4d3b9c7e2bfcee6bfec7150f96a31622893a37b0tree | snapshot
parent9ad472e337f830118bb589f756d2759f642228bbcommit | diff
parentd34ded7ece57782e75bf31bb145836b9f280750fcommit | 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
John Crispins staging tree