Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: remove printks about disabled bridge windows
  PCI: fold pci_calc_resource_flags() into decode_bar()
  PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
  PCI: correct pcie_set_readrq write size
  PCI: pciehp: change wait time for valid configuration access
  x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
  PCI: ARI is a PCIe v2 feature
  x86/PCI: quirks: Use pci_dev->revision
  PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
  PCI hotplug: cpqphp: use pci_dev->vendor
  PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
  x86/PCI: config space accessor functions should not ignore the segment argument
  PCI: Assign values to 'pci_obff_signal_type' enumeration constants
  x86/PCI: reduce severity of host bridge window conflict warnings
  PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI
  PCI: PCIe AER: add aer_recover_queue
  x86/PCI: select direct access mode for mmconfig option
  PCI hotplug: Rename is_ejectable which also exists in dock.c

diff --cc arch/alpha/kernel/sys_ruffian.c
Simple merge

diff --cc arch/arm/common/it8152.c
Simple merge

diff --cc arch/arm/mach-cns3xxx/pcie.c
Simple merge

diff --cc arch/arm/mach-dove/pcie.c
Simple merge

diff --cc arch/arm/mach-iop13xx/pci.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/goramo_mlr.c
Simple merge

diff --cc arch/arm/mach-kirkwood/pcie.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/pcie.c
Simple merge

diff --cc arch/arm/mach-orion5x/pci.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x2xx-pci.c
Simple merge

diff --cc arch/arm/mach-sa1100/pci-nanoengine.c
Simple merge

diff --cc arch/arm/mach-shark/pci.c
Simple merge

diff --cc arch/arm/mach-tegra/pcie.c
Simple merge

diff --cc arch/arm/mach-versatile/pci.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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