]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit88835a4b9c08dd8531893fad8ba003e56bdf58c7
tree4d3b9c7e2bfcee6bfec7150f96a31622893a37b0
parentdff1acebfcffcb284f47611da1bccf2153b0e1f8
parent3c3abb1325e2bbc8acdf839a7dede711f6ea169d
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