Merge branch 'pci/trivial'

  - Cleanup PCI register definitions, typos, etc (Bjorn Helgaas)

  - Remove unnecessary use of user-space types in CPER (Bjorn Helgaas)

  - Cleanup setup-bus.c comments & whitespace (Nicholas Johnson)

* pci/trivial:
  PCI: Cleanup setup-bus.c comments and whitespace
  CPER: Remove unnecessary use of user-space types
  CPER: Add UEFI spec references
  PCI: Fix comment typos
  PCI: Cleanup register definition width and whitespace

# Conflicts:
#	drivers/pci/pci.c
#	drivers/pci/setup-bus.c

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/setup-bus.c
index c73e667,6728144..0cdd5ff
--- 1/drivers/pci/setup-bus.c
--- 2/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@@ -1530,9 -1526,9 +1525,9 @@@ static void pci_bridge_release_resource
        release_child_resources(r);
        if (!release_resource(r)) {
                type = old_flags = r->flags & PCI_RES_TYPE_MASK;
 -              pci_printk(KERN_DEBUG, dev, "resource %d %pR released\n",
 -                                      PCI_BRIDGE_RESOURCES + idx, r);
 +              pci_info(dev, "resource %d %pR released\n",
 +                       PCI_BRIDGE_RESOURCES + idx, r);
-               /* keep the old size */
+               /* Keep the old size */
                r->end = resource_size(r) - 1;
                r->start = 0;
                r->flags = 0;
@@@ -1764,10 -1763,10 +1761,10 @@@ again
                goto dump;
        }
  
 -      dev_printk(KERN_DEBUG, &bus->dev,
 -                 "No. %d try to assign unassigned res\n", tried_times + 1);
 +      dev_info(&bus->dev, "No. %d try to assign unassigned res\n",
 +               tried_times + 1);
  
-       /* third times and later will not check if it is leaf */
+       /* Third times and later will not check if it is leaf */
        if ((tried_times + 1) > 2)
                rel_type = whole_subtree;
  

diff --cc include/uapi/linux/pci_regs.h
Simple merge