]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge tag 'platform-drivers-x86-v4.15-4' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jan 2018 19:52:24 +0000 (11:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jan 2018 19:52:24 +0000 (11:52 -0800)
Pull x86 platform driver fix from Darren Hart:
 "Address a wmi initcall ordering race resulting in a difficult to
  reproduce boot failure"

* tag 'platform-drivers-x86-v4.15-4' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: wmi: Call acpi_wmi_init() later


Trivial merge