2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
linux-next/arch/arm/mach-kirkwood
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 New feature development 2012-01-09 14:38:51 -08:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
common.c New feature development 2012-01-09 14:38:51 -08:00
common.h New feature development 2012-01-09 14:38:51 -08:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
d2net_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
db88f6281-bp-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
dockstar-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
guruplug-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig Kirkwood: Add support for 6282 based QNAP devices 2010-12-07 13:50:14 -05:00
lacie_v2-common.c [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile [ARM] Kirkwood: remove duplicated code in LaCie setup files 2010-09-19 22:43:45 -04:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05:00
mpp.h ARM: Kirkwood: Add configuration for MPP12 as GPIO 2011-12-13 18:41:36 -05:00
mv88f6281gtw_ge-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
netspace_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
netxbig_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
openrd-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
pcie.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
rd88f6192-nas-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
rd88f6281-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
sheevaplug-setup.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
t5325-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
ts41x-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
ts219-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
tsx1x-common.c Fix common misspellings 2011-03-31 11:26:23 -03:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00