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
..
ashldi3.c
ashrdi3.c
cmpdi2.c
csum_partial.S
delay.c
dump_tlb.c
iomap-pci.c	mips: switch to GENERIC_PCI_IOMAP	2011-11-28 21:13:13 +02:00
iomap.c
libgcc.h	MIPS: libgcc.h: Checkpatch cleanup	2010-04-12 17:26:15 +01:00
lshrdi3.c
Makefile	MIPS: Netlogic: Add XLP makefiles and config	2011-12-07 22:04:56 +00:00
memcpy-inatomic.S
memcpy.S
memset.S	MIPS: Separate two consecutive loads in memset.S	2010-12-16 18:10:57 +00:00
r3k_dump_tlb.c
strlen_user.S
strncpy_user.S
strnlen_user.S	Fix common misspellings	2011-03-31 11:26:23 -03:00
ucmpdi2.c
uncached.c