Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: SMTC: Fix lockup in smtc_distribute_timer MIPS: TXx9: Update rbtx49xx_defconfig MIPS: Make local arrays with CL_SIZE static __initdata MIPS: Add DMA declare coherent memory support MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs.
Showing
- arch/mips/Kconfig 1 addition, 0 deletionsarch/mips/Kconfig
- arch/mips/bcm47xx/prom.c 1 addition, 1 deletionarch/mips/bcm47xx/prom.c
- arch/mips/configs/rbtx49xx_defconfig 192 additions, 60 deletionsarch/mips/configs/rbtx49xx_defconfig
- arch/mips/include/asm/dma-mapping.h 1 addition, 10 deletionsarch/mips/include/asm/dma-mapping.h
- arch/mips/kernel/cevt-smtc.c 2 additions, 1 deletionarch/mips/kernel/cevt-smtc.c
- arch/mips/math-emu/cp1emu.c 21 additions, 20 deletionsarch/mips/math-emu/cp1emu.c
- arch/mips/mm/dma-default.c 7 additions, 0 deletionsarch/mips/mm/dma-default.c
- arch/mips/mti-malta/malta-memory.c 2 additions, 1 deletionarch/mips/mti-malta/malta-memory.c
- arch/mips/rb532/prom.c 1 addition, 1 deletionarch/mips/rb532/prom.c
- arch/mips/txx9/generic/setup.c 2 additions, 2 deletionsarch/mips/txx9/generic/setup.c
Loading
Please register or sign in to comment