Merge branch 'pci/resource'

  - Protect pci_reassign_bridge_resources() against concurrent
    addition/removal (Benjamin Herrenschmidt)

  - Fix bridge dma_ranges resource list cleanup (Rob Herring)

  - Add PCI_STD_NUM_BARS for the number of standard BARs (Denis Efremov)

  - Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters to control the
    MMIO and prefetchable MMIO window sizes of hotplug bridges
    independently (Nicholas Johnson)

  - Fix MMIO/MMIO_PREF window assignment that assigned more space than
    desired (Nicholas Johnson)

  - Only enforce bus numbers from bridge EA if the bridge has EA devices
    downstream (Subbaraya Sundeep)

* pci/resource:
  PCI: Do not use bus number zero from EA capability
  PCI: Avoid double hpmemsize MMIO window assignment
  PCI: Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters
  PCI: Add PCI_STD_NUM_BARS for the number of standard BARs
  PCI: Fix missing bridge dma_ranges resource list cleanup
  PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/s390/pci/pci_clp.c
Simple merge

diff --cc drivers/memstick/host/jmb38x_ms.c
Simple merge

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

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

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

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

diff --cc include/linux/pci.h
Simple merge

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