Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits) MIPS: Alchemy: Fix reset for MTX-1 and XXS1500 MIPS: MTX-1: Make au1000_eth probe all PHY addresses MIPS: Jz4740: Add HAVE_CLK MIPS: Move idle task creation to work queue MIPS, Perf-events: Use unsigned delta for right shift in event update MIPS, Perf-events: Work with the new callchain interface MIPS, Perf-events: Fix event check in validate_event() MIPS, Perf-events: Work with the new PMU interface MIPS, Perf-events: Work with irq_work MIPS: Fix always CONFIG_LOONGSON_UART_BASE=y MIPS: Loongson: Fix potentially wrong string handling MIPS: Fix GCC-4.6 'set but not used' warning in arch/mips/mm/init.c MIPS: Fix GCC-4.6 'set but not used' warning in ieee754int.h MIPS: Remove unused code from arch/mips/kernel/syscall.c MIPS: Fix GCC-4.6 'set but not used' warning in signal*.c MIPS: MSP: Fix MSP71xx bpci interrupt handler return value MIPS: Select R4K timer lib for all MSP platforms MIPS: Loongson: Remove ad-hoc cmdline default MIPS: Clear the correct flag in sysmips(MIPS_FIXADE, ...). MIPS: Add an unreachable return statement to satisfy buggy GCCs. ...
Showing
- arch/mips/Kconfig 4 additions, 0 deletionsarch/mips/Kconfig
- arch/mips/alchemy/mtx-1/board_setup.c 2 additions, 2 deletionsarch/mips/alchemy/mtx-1/board_setup.c
- arch/mips/alchemy/mtx-1/platform.c 9 additions, 0 deletionsarch/mips/alchemy/mtx-1/platform.c
- arch/mips/alchemy/xxs1500/board_setup.c 2 additions, 2 deletionsarch/mips/alchemy/xxs1500/board_setup.c
- arch/mips/include/asm/perf_event.h 1 addition, 11 deletionsarch/mips/include/asm/perf_event.h
- arch/mips/kernel/ftrace.c 95 additions, 84 deletionsarch/mips/kernel/ftrace.c
- arch/mips/kernel/perf_event.c 166 additions, 179 deletionsarch/mips/kernel/perf_event.c
- arch/mips/kernel/perf_event_mipsxx.c 3 additions, 1 deletionarch/mips/kernel/perf_event_mipsxx.c
- arch/mips/kernel/signal.c 1 addition, 1 deletionarch/mips/kernel/signal.c
- arch/mips/kernel/signal32.c 1 addition, 1 deletionarch/mips/kernel/signal32.c
- arch/mips/kernel/smp.c 29 additions, 2 deletionsarch/mips/kernel/smp.c
- arch/mips/kernel/syscall.c 2 additions, 3 deletionsarch/mips/kernel/syscall.c
- arch/mips/kernel/vpe.c 2 additions, 2 deletionsarch/mips/kernel/vpe.c
- arch/mips/loongson/Kconfig 4 additions, 1 deletionarch/mips/loongson/Kconfig
- arch/mips/loongson/common/cmdline.c 0 additions, 5 deletionsarch/mips/loongson/common/cmdline.c
- arch/mips/loongson/common/machtype.c 2 additions, 1 deletionarch/mips/loongson/common/machtype.c
- arch/mips/math-emu/ieee754int.h 2 additions, 2 deletionsarch/mips/math-emu/ieee754int.h
- arch/mips/mm/init.c 1 addition, 1 deletionarch/mips/mm/init.c
- arch/mips/mm/tlbex.c 2 additions, 0 deletionsarch/mips/mm/tlbex.c
- arch/mips/pci/ops-pmcmsp.c 2 additions, 2 deletionsarch/mips/pci/ops-pmcmsp.c
Loading
Please register or sign in to comment