From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 2 Jan 2019 21:31:03 +0000 (-0600)
Subject: Merge branch 'pci/misc'
X-Git-Tag: v5.4-rc1~1845^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6397dfcb58d8fcecea314026d4539c85f0dd94b;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pci/misc'

  - Expand Kconfig "PF" acronyms (Randy Dunlap)

  - Update MAINTAINERS for arch/x86/kernel/early-quirks.c (Bjorn Helgaas)

  - Add missing include to drivers/pci.h (Alexandru Gagniuc)

  - Override Synopsys USB 3.x HAPS device class so dwc3-haps can claim it
    instead of xhci (Thinh Nguyen)

* pci/misc:
  PCI: Override Synopsys USB 3.x HAPS device class
  PCI: Move Synopsys HAPS platform device IDs
  PCI: Add missing include to drivers/pci.h
  PCI: Remove unnecessary space before function pointer arguments
  MAINTAINERS: Add x86 early-quirks.c file pattern to PCI subsystem
  PCI: Expand the "PF" acronym in Kconfig help text
---

e6397dfcb58d8fcecea314026d4539c85f0dd94b