Merge branch 'pci/trivial' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 20 Jan 2016 17:48:25 +0000 (11:48 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 20 Jan 2016 17:48:25 +0000 (11:48 -0600)
commit9662e32c810ad3e6ce49832d5f585a54f8fbdbdb
treefd9fd3f8cd44e231b8dc71c2e360eb19963972d5
parent904f664b585cc9f3dc134a8c0dd08e9bce6c10bc
parentbd7900825a3db4c4916fafb400c1f669120039d2
Merge branch 'pci/trivial' into next

* pci/trivial:
  PCI: shpchp: Constify hpc_ops structure
  PCI: Use kobj_to_dev() instead of open-coding it
  PCI: Use to_pci_dev() instead of open-coding it
  PCI: Fix all whitespace issues
  PCI/MSI: Fix typos in <linux/msi.h>
12 files changed:
drivers/pci/host/pci-imx6.c
drivers/pci/hotplug/acpiphp_ibm.c
drivers/pci/hotplug/ibmphp_core.c
drivers/pci/hotplug/ibmphp_ebda.c
drivers/pci/hotplug/ibmphp_hpc.c
drivers/pci/hotplug/ibmphp_pci.c
drivers/pci/hotplug/ibmphp_res.c
drivers/pci/hotplug/pci_hotplug_core.c
drivers/pci/hotplug/pcihp_skeleton.c
drivers/pci/hotplug/rpaphp_core.c
drivers/pci/hotplug/shpchp_core.c
drivers/pci/pci-sysfs.c