kernel-ark/arch/xtensa/kernel
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
..
align.S
asm-offsets.c xtensa: Shuffle include statements to fix linker script 2010-05-02 01:05:13 -07:00
coprocessor.S
entry.S Fix common misspellings 2011-03-31 11:26:23 -03:00
head.S xtensa: Fixes due to bss boundary symbol name changes. 2010-05-01 23:05:29 -07:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
io.c
irq.c xtensa: Fixup irq conversion fallout and nmi_count 2011-04-20 00:32:09 +02:00
Makefile xtensa: Fix linker script patch-up 2010-05-01 23:00:07 -07:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
pci-dma.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pci.c xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources 2012-01-06 12:11:14 -08:00
platform.c
process.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
ptrace.c xtensa: prevent arbitrary read in ptrace 2011-07-25 20:57:07 -07:00
setup.c
signal.c
syscall.c sanitize do_pipe_flags() callers in arch 2009-12-16 12:16:40 -05:00
time.c clocksource: xtensa: Convert to clocksource_register_hz/khz 2011-11-21 19:01:04 -08:00
traps.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
vectors.S xtensa: includecheck fix: vectors.S 2010-05-25 08:06:56 -07:00
vmlinux.lds.S percpu: Always align percpu output section to PAGE_SIZE 2011-03-24 18:50:09 +01:00
xtensa_ksyms.c