1
linux/arch/mips/pci
Bjorn Helgaas 78890b5989 Merge commit 'v3.6-rc5' into next
* commit 'v3.6-rc5': (1098 commits)
  Linux 3.6-rc5
  HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured
  Remove user-triggerable BUG from mpol_to_str
  xen/pciback: Fix proper FLR steps.
  uml: fix compile error in deliver_alarm()
  dj: memory scribble in logi_dj
  Fix order of arguments to compat_put_time[spec|val]
  xen: Use correct masking in xen_swiotlb_alloc_coherent.
  xen: fix logical error in tlb flushing
  xen/p2m: Fix one-off error in checking the P2M tree directory.
  powerpc: Don't use __put_user() in patch_instruction
  powerpc: Make sure IPI handlers see data written by IPI senders
  powerpc: Restore correct DSCR in context switch
  powerpc: Fix DSCR inheritance in copy_thread()
  powerpc: Keep thread.dscr and thread.dscr_inherit in sync
  powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
  powerpc/powernv: Always go into nap mode when CPU is offline
  powerpc: Give hypervisor decrementer interrupts their own handler
  powerpc/vphn: Fix arch_update_cpu_topology() return value
  ARM: gemini: fix the gemini build
  ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/rapidio/devices/tsi721.c
2012-09-13 08:41:01 -06:00
..
fixup-bcm63xx.c
fixup-capcella.c
fixup-cobalt.c MIPS: PCI: Add missing __devinit attributions to fixup functions. 2012-07-23 13:55:55 +01:00
fixup-emma2rh.c
fixup-fuloong2e.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-ip32.c
fixup-jmr3927.c
fixup-lantiq.c MIPS: pci: convert lantiq driver to OF 2012-05-21 14:31:52 +01:00
fixup-lemote2f.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-malta.c MIPS: Malta: Move PIIX4 PCI fixup to where it belongs. 2012-07-23 13:55:55 +01:00
fixup-mpc30x.c mips: mark const init data with __initconst instead of __initdata 2012-07-19 11:23:43 +02:00
fixup-pmcmsp.c
fixup-pnx8550.c
fixup-rbtx4927.c
fixup-rbtx4938.c
fixup-rc32434.c MIPS: PCI: Add missing __devinit attributions to fixup functions. 2012-07-23 13:55:55 +01:00
fixup-sb1250.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-sni.c
fixup-tb0219.c
fixup-tb0226.c
fixup-tb0287.c
fixup-wrppmc.c
fixup-yosemite.c
Makefile MIPS: Netlogic: XLP PCIe controller support. 2012-07-24 17:28:54 +02:00
msi-octeon.c MIPS: Fix up inconsistency in panic() string argument. 2011-12-07 22:01:45 +00:00
ops-bcm63xx.c Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next 2012-07-25 16:37:46 +02:00
ops-bonito64.c
ops-bridge.c
ops-emma2rh.c
ops-gt64xxx_pci0.c
ops-lantiq.c MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
ops-loongson2.c MIPS: Include export.h in for EXPORT_SYMBOL in ops-loongson2.c 2012-05-15 17:47:01 +02:00
ops-mace.c
ops-msc.c
ops-nile4.c MIPS: NILE4: Remove useless inclusion of GT64120 header. 2011-07-20 23:12:09 +01:00
ops-pmcmsp.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-pnx8550.c
ops-rc32434.c
ops-sni.c
ops-titan-ht.c
ops-titan.c
ops-tx3927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-tx4927.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
ops-vr41xx.c
pci-alchemy.c MIPS: Fix Jazz 64-bit build error. 2011-12-07 22:01:45 +00:00
pci-ar71xx.c MIPS: ath79: add support for the PCI host controller of the AR71XX SoCs 2012-05-15 17:49:05 +02:00
pci-ar724x.c MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module 2012-08-23 15:44:47 +02:00
pci-bcm47xx.c bcma: add PCIe host controller 2012-02-06 14:53:04 -05:00
pci-bcm63xx.c MIPS: BCM63XX: Add PCIe Support for BCM6328 2012-07-24 16:33:13 +02:00
pci-bcm63xx.h MIPS: BCM63XX: Add PCIe Support for BCM6328 2012-07-24 16:33:13 +02:00
pci-bcm1480.c mips/PCI: replace pci_probe_only with pci_flags 2012-02-23 20:18:57 -07:00
pci-bcm1480ht.c
pci-emma2rh.c
pci-ip27.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
pci-ip32.c
pci-lantiq.c mips: pci-lantiq: Fix check for valid gpio 2012-07-05 15:02:18 +02:00
pci-lantiq.h MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
pci-lasat.c
pci-octeon.c MIPS: PCI: Use PCI Express Capability accessors 2012-08-23 10:11:12 -06:00
pci-rc32434.c MIPS: RC32434: Fix PCI build error 2011-09-21 17:51:57 +02:00
pci-sb1250.c mips/PCI: replace pci_probe_only with pci_flags 2012-02-23 20:18:57 -07:00
pci-tx4927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-tx4938.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-tx4939.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-vr41xx.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pci-vr41xx.h
pci-xlp.c MIPS: Netlogic: XLP PCIe controller support. 2012-07-24 17:28:54 +02:00
pci-xlr.c MIPS: Netlogic: Remove unused pcibios_fixups 2012-07-24 17:28:55 +02:00
pci-yosemite.c
pci.c Merge branch 'pci/myron-pcibios_setup' into next 2012-07-05 15:31:05 -06:00
pcie-octeon.c MIPS: Octeon: Add support for OCTEON II PCIe 2011-12-08 12:32:57 +00:00