You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		13 years ago
..
generic	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	13 years ago
jmr3927	MIPS: Convert the irq functions to the new names	14 years ago
rbtx4927	MIPS: Convert the irq functions to the new names	14 years ago
rbtx4938	MIPS: Convert the irq functions to the new names	14 years ago
rbtx4939	mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE	13 years ago
Kconfig	MIPS: TXx9: Add ACLC support	16 years ago
Makefile	MIPS: TXx9: Migrate to new platform makefile style.	15 years ago
Platform	MIPS: TXx9: Migrate to new platform makefile style.	15 years ago