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
..
2011-09-21 13:39:59 -07:00
2005-10-18 08:26:15 -07:00
2011-07-26 16:49:47 -07:00
2008-07-24 10:47:33 -07:00
2011-03-11 14:25:50 +00:00
2008-06-06 11:29:10 -07:00
2007-07-16 09:05:50 -07:00
2011-10-29 21:20:22 +02:00
2007-07-17 10:23:04 -07:00
2006-06-25 10:01:20 -07:00
2012-01-10 16:30:51 -08:00
2005-04-16 15:20:36 -07:00
2006-06-25 10:01:20 -07:00
2007-05-10 18:24:13 +02:00
2011-07-26 16:49:47 -07:00
2011-03-31 11:26:23 -03:00
2005-04-16 15:20:36 -07:00
2012-01-03 22:54:56 -05:00
2009-06-18 13:04:05 -07:00
2010-05-25 08:07:06 -07:00
2005-04-16 15:20:36 -07:00
2011-09-20 23:24:44 -04:00
2010-04-06 15:52:11 -07:00
2011-11-02 16:07:00 -07:00
2006-06-20 20:24:58 -07:00
2011-11-28 21:12:42 +02:00
2010-08-09 20:45:05 -07:00
2006-10-06 08:53:40 -07:00
2011-07-25 20:57:15 -07:00
2011-08-06 18:32:45 -07:00
2011-11-04 17:47:34 -04:00
2011-03-31 11:26:23 -03:00
2011-11-28 21:12:42 +02:00
2005-04-16 15:20:36 -07:00
2010-06-16 18:08:13 +02:00
2010-01-11 09:34:05 -08:00
2011-12-08 19:52:43 -05:00
2008-07-26 12:00:10 -07:00
2011-03-31 11:26:23 -03:00
2010-05-19 22:40:47 -04:00