From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Nov 2017 23:17:08 +0000 (+1000)
Subject: Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf6eb600e5b835a96d676b2b9df603362a1e714c;p=linux.git

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
---

bf6eb600e5b835a96d676b2b9df603362a1e714c