leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
134d12fae0
linux/arch/mips/pci
History
Linus Torvalds 4964e0664c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
  MIPS: Delete unused function add_temporary_entry.
  MIPS: Set default pci cache line size.
  MIPS: Flush huge TLB
  MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
  MIPS: Octeon: Add support for OCTEON II PCIe
  MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
  MIPS: Alchemy: Update cpu-feature-overrides
  MIPS: Alchemy: db1200: Improve PB1200 detection.
  MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
  MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
  MIPS: Alchemy: irq: register pm at irq init time
  MIPS: Alchemy: Touchscreen support on DB1100
  MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
  net/irda: convert au1k_ir to platform driver.
  MIPS: Alchemy: remove unused board headers
  MTD: nand: make au1550nd.c a platform_driver
  MIPS: Netlogic: Mark Netlogic chips as SMT capable
  MIPS: Netlogic: Add support for XLP 3XX cores
  MIPS: Netlogic: Merge some of XLR/XLP wakup code
  MIPS: Netlogic: Add default XLP config.
  ...

Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
traps.c} and drivers/tty/serial/Makefile
2012-01-14 13:05:21 -08:00
..
fixup-bcm63xx.c MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
fixup-capcella.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-cobalt.c MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses 2010-02-27 12:53:44 +01:00
fixup-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
fixup-fuloong2e.c Fix typo configue => configure in comments 2010-09-23 11:46:50 +02:00
fixup-ip32.c
fixup-jmr3927.c
fixup-lemote2f.c MIPS: Loongson: Lemote-2F: USB: Not Emulate Non-Posted Writes 2010-02-27 12:53:09 +01:00
fixup-malta.c
fixup-mpc30x.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-pmcmsp.c
fixup-pnx8550.c
fixup-rbtx4927.c
fixup-rbtx4938.c
fixup-rc32434.c
fixup-sb1250.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
fixup-sni.c
fixup-tb0219.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-tb0226.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-tb0287.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-wrppmc.c
fixup-yosemite.c
Makefile Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next 2012-01-11 15:42:31 +01:00
msi-octeon.c MIPS: Fix up inconsistency in panic() string argument. 2011-12-07 22:01:45 +00:00
ops-bcm63xx.c MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
ops-bonito64.c MIPS: Bonito64: Make Loongson independent from Bonito64 code. 2009-12-17 01:57:06 +00:00
ops-bridge.c
ops-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
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: Lemote 2F: Ensure atomic execution of _rdmsr and _wrmsr 2010-04-12 17:26:12 +01: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 MIPS: PCI: RM9000 checkpatch cleanup 2010-08-05 13:25:44 +01:00
ops-titan.c
ops-tx3927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-tx4927.c MIPS: Add missing #inclusions of <linux/irq.h> 2010-10-07 14:08:54 +01:00
ops-vr41xx.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
pci-alchemy.c MIPS: Fix Jazz 64-bit build error. 2011-12-07 22:01:45 +00:00
pci-ath724x.c MIPS: Initial PCI support for Atheros 724x SoCs. 2011-12-07 22:02:47 +00:00
pci-bcm47xx.c bcm47xx: make it possible to build bcm47xx without ssb. 2011-08-08 14:29:31 -04:00
pci-bcm63xx.c MIPS: BCM63XX: Add support for bcm6368 CPU. 2011-12-07 22:03:04 +00:00
pci-bcm63xx.h MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
pci-bcm1480.c Fix common misspellings 2011-03-31 11:26:23 -03:00
pci-bcm1480ht.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
pci-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
pci-ip27.c mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:57 -04:00
pci-ip32.c
pci-lantiq.c MIPS: lantiq: use export.h in favour of module.h 2011-11-14 13:59:24 +00: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: Octeon: Update PCI Latency timer and enable more error reporting. 2011-12-08 12:26:28 +00:00
pci-rc32434.c MIPS: RC32434: Fix PCI build error 2011-09-21 17:51:57 +02:00
pci-sb1250.c MIPS: SB1250: Include correct header and fix a warning 2010-04-30 20:52:43 +01: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 Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
pci-xlr.c MIPS: Netlogic: Move code common with XLP to common/ 2011-12-07 22:04:55 +00:00
pci-yosemite.c MIPS: Set io_map_base for several PCI bridges lacking it 2010-07-26 19:08:19 +01:00
pci.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-01-14 13:05:21 -08:00
pcie-octeon.c MIPS: Octeon: Add support for OCTEON II PCIe 2011-12-08 12:32:57 +00:00