mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 01:04:19 +08:00
4964e0664c
* '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
|
||
|---|---|---|
| .. | ||
| act200l-sir.c | ||
| actisys-sir.c | ||
| ali-ircc.c | ||
| ali-ircc.h | ||
| au1k_ir.c | ||
| bfin_sir.c | ||
| bfin_sir.h | ||
| donauboe.c | ||
| donauboe.h | ||
| ep7211-sir.c | ||
| esi-sir.c | ||
| girbil-sir.c | ||
| irda-usb.c | ||
| irda-usb.h | ||
| irtty-sir.c | ||
| irtty-sir.h | ||
| Kconfig | ||
| kingsun-sir.c | ||
| ks959-sir.c | ||
| ksdazzle-sir.c | ||
| litelink-sir.c | ||
| ma600-sir.c | ||
| Makefile | ||
| mcp2120-sir.c | ||
| mcs7780.c | ||
| mcs7780.h | ||
| nsc-ircc.c | ||
| nsc-ircc.h | ||
| old_belkin-sir.c | ||
| pxaficp_ir.c | ||
| sa1100_ir.c | ||
| sh_irda.c | ||
| sh_sir.c | ||
| sir_dev.c | ||
| sir_dongle.c | ||
| sir-dev.h | ||
| smsc-ircc2.c | ||
| smsc-ircc2.h | ||
| smsc-sio.h | ||
| stir4200.c | ||
| tekram-sir.c | ||
| toim3232-sir.c | ||
| via-ircc.c | ||
| via-ircc.h | ||
| vlsi_ir.c | ||
| vlsi_ir.h | ||
| w83977af_ir.c | ||
| w83977af_ir.h | ||
| w83977af.h | ||