q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-footbridge
History
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
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
cats-hw.c ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00
cats-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
common.c ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00
common.h ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00
dc21285-timer.c ARM: footbridge: fix clock event support 2011-06-11 00:46:17 +01:00
dc21285.c arm/PCI: convert to pci_scan_root_bus() for correct root bus resources 2012-01-06 12:10:56 -08:00
dma.c
ebsa285-leds.c
ebsa285-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ebsa285.c ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00
isa-irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
isa-rtc.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
isa-timer.c arm: Footbridge: Use common i8253 clockevent 2011-07-01 10:37:14 +02:00
isa.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
Kconfig ARM: 7078/1: Footbridge: Sort KConfig Options alphabetically 2011-10-17 09:12:42 +01:00
Makefile ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
netwinder-hw.c ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00
netwinder-leds.c locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
netwinder-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
personal-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
personal.c ARM: restart: footbridge: use new restart hook 2012-01-05 12:57:12 +00:00