]> 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)
commitb5eb2eb62ebacc5e2d3e89bea3f1b15daf671309
tree4d3b9c7e2bfcee6bfec7150f96a31622893a37b0
parent270e755384e5ff22717d9d4a82a6183d010c30f8
parentff3bf24be0c394391187cdcb33a4dd1719136663
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