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
..
boards	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-01-14 13:05:21 -08:00
clk.c	MIPS: BCM63XX: Add support for bcm6368 CPU.	2011-12-07 22:03:04 +00:00
cpu.c	MIPS: BCM63xx: Fix SDRAM size computation for BCM6345	2011-12-07 22:03:04 +00:00
cs.c
dev-dsp.c
dev-enet.c	MIPS: BCM63xx: Prevent second enet registration on BCM6338	2010-07-26 19:08:18 +01:00
dev-pcmcia.c	MIPS: BCM63xx: Add PCMCIA & Cardbus support.	2009-09-30 21:47:01 +02:00
dev-uart.c	MIPS: BCM63XX: Add support for bcm6368 CPU.	2011-12-07 22:03:04 +00:00
dev-wdt.c	MIPS: BCM63xx: Prepare for watchdog support	2009-11-02 12:00:03 +01:00
early_printk.c
gpio.c	MIPS: BCM63xx: Fix GPIO set/get for BCM6345	2011-12-07 22:03:04 +00:00
irq.c	MIPS: BCM63XX: Add support for bcm6368 CPU.	2011-12-07 22:03:04 +00:00
Kconfig	MIPS: BCM63XX: Add support for bcm6368 CPU.	2011-12-07 22:03:04 +00:00
Makefile	MIPS: BCM63xx: Migrate to new platform makefile style.	2010-08-05 13:25:54 +01:00
Platform	MIPS: BCM63xx: Migrate to new platform makefile style.	2010-08-05 13:25:54 +01:00
prom.c	MIPS: BCM63XX: Add support for bcm6368 CPU.	2011-12-07 22:03:04 +00:00
setup.c	MIPS: BCM63XX: Add external irq support for non 6348 CPUs.	2011-12-07 22:03:04 +00:00
timer.c	MIPS: BCM63xx: Convert timer locks to raw spinlocks.	2010-02-27 12:53:35 +01:00