* '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
|
||
|---|---|---|
| .. | ||
| bcm63xx_board.h | ||
| bcm63xx_clk.h | ||
| bcm63xx_cpu.h | ||
| bcm63xx_cs.h | ||
| bcm63xx_dev_dsp.h | ||
| bcm63xx_dev_enet.h | ||
| bcm63xx_dev_pci.h | ||
| bcm63xx_dev_pcmcia.h | ||
| bcm63xx_dev_uart.h | ||
| bcm63xx_gpio.h | ||
| bcm63xx_io.h | ||
| bcm63xx_irq.h | ||
| bcm63xx_regs.h | ||
| bcm63xx_timer.h | ||
| bcm963xx_tag.h | ||
| board_bcm963xx.h | ||
| cpu-feature-overrides.h | ||
| gpio.h | ||
| ioremap.h | ||
| irq.h | ||
| spaces.h | ||
| war.h | ||