Merge branch 'pci/enumeration'

-  Collect interrupt-related code in irq.c (Ilpo Järvinen)

- Mark 3ware-9650SE Root Port Extended Tags as broken (Jörg Wedekind)

* pci/enumeration:
  PCI: Mark 3ware-9650SE Root Port Extended Tags as broken
  PCI: Place interrupt related code into irq.c

# Conflicts:
#	drivers/pci/Makefile

diff --cc drivers/pci/Makefile
index ed65299b42b5403c5318c0c276967350689ffe98,54a7adf0bb88cfecdbf546ba5d97be957e232609..147779831b1303da43f03f996920b3ce627140a6
--- 1/drivers/pci/Makefile
--- 2/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -5,7 -5,7 +5,7 @@@
  obj-$(CONFIG_PCI)             += access.o bus.o probe.o host-bridge.o \
                                   remove.o pci.o pci-driver.o search.o \
                                   pci-sysfs.o rom.o setup-res.o irq.o vpd.o \
-                                  setup-bus.o vc.o mmap.o setup-irq.o devres.o
 -                                 setup-bus.o vc.o mmap.o
++                                 setup-bus.o vc.o mmap.o devres.o
  
  obj-$(CONFIG_PCI)             += msi/
  obj-$(CONFIG_PCI)             += pcie/

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

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