Linus Torvalds 7b67e75147 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
2012-01-11 18:50:26 -08:00
..
2010-08-04 10:26:03 +10:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-06-20 11:21:48 +10:00
2011-07-26 16:49:47 -07:00
2011-11-08 14:51:46 +11:00
2009-12-10 20:08:15 -06:00
2010-10-26 16:52:08 -07:00
2011-03-02 16:50:24 +11:00
2008-08-18 21:40:03 +02:00
2008-08-04 13:18:17 +10:00
2011-07-26 16:49:47 -07:00
2011-12-08 14:02:23 +11:00
2011-03-31 11:26:23 -03:00
2011-05-22 08:47:53 -04:00
2010-05-17 12:18:23 +03:00
2011-12-27 11:26:43 +02:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2010-05-05 09:11:10 -04:00
2011-09-20 09:19:40 +10:00
2011-12-07 18:02:02 +11:00
2011-03-31 11:26:23 -03:00
2010-03-05 03:04:08 -06:00
2010-10-26 16:52:08 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2009-04-07 15:18:58 +10:00
2009-12-09 17:10:37 +11:00
2011-09-20 09:19:40 +10:00
2011-09-27 18:08:04 +02:00
2010-03-05 03:04:08 -06:00
2011-12-09 07:51:02 -05:00
2011-04-20 17:01:19 +10:00
2011-03-31 11:26:23 -03:00
2008-09-06 19:30:15 +01:00
2009-08-28 14:24:10 +10:00
2011-10-31 17:30:44 -07:00
2011-12-16 11:09:21 +11:00
2011-10-31 17:30:44 -07:00
2011-03-31 11:26:23 -03:00
2011-05-06 13:32:35 +10:00
2011-11-08 14:51:46 +11:00