Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Merge commit. Changes below are compared with the first parent: 9d9ad4b5.
Changes
157 files changed · +4102 −2221
Only the first 600 diff lines are shown. Download the complete patch.
arch/mips/Kconfig
View filearch/mips/Kconfig.debug
View filearch/mips/Makefile
View filearch/mips/au1000/common/cputable.c
View filearch/mips/au1000/common/dbdma.c
View filearch/mips/au1000/common/dbg_io.c
View filearch/mips/au1000/common/dma.c
View filearch/mips/au1000/common/gpio.c
View filearch/mips/au1000/common/irq.c
View filearch/mips/au1000/common/pci.c
View filearch/mips/au1000/common/platform.c
View filearch/mips/au1000/common/power.c
View filearch/mips/au1000/common/prom.c
View filearch/mips/au1000/common/puts.c
View filearch/mips/au1000/common/reset.c
View filearch/mips/au1000/common/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/common/sleeper.S
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/common/time.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/db1x00/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/db1x00/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/db1x00/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/mtx-1/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/mtx-1/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/mtx-1/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/mtx-1/platform.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1000/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1000/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1000/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1100/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1100/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1100/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1200/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1200/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1200/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1200/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1200/platform.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1500/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1500/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1500/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1550/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1550/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/pb1550/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/xxs1500/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/xxs1500/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/au1000/xxs1500/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/configs/mipssim_defconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/configs/pnx8550-jbs_defconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/configs/pnx8550-stb810_defconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/dec/time.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/jmr3927/rbhma3100/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/cevt-ds1287.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/cevt-gt641xx.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/cpu-probe.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/csrc-ioasic.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/gpio_txx9.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/irq-gic.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/irq-msc01.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/signal-common.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/smp-cmp.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/smp-mt.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/smp.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/smtc.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/spram.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/sync-r4k.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/time.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/traps.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/math-emu/ieee754dp.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/math-emu/ieee754sp.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/generic/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/generic/amon.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/generic/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/generic/memory.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/generic/time.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/malta/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/malta/malta_int.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mips-boards/malta/malta_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mipssim/sim_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/c-r4k.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/cache.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/page.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/pg-r4k.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/mm/pg-sb1.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/mm/pgtable.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/tlb-r4k.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/uasm.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/mm/uasm.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/gdb_hook.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/int.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/pci.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/platform.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/proc.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/prom.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/reset.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/common/time.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/jbs/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/jbs/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/jbs/init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/jbs/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/stb810/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/stb810/board_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/stb810/irqmap.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx8550/stb810/prom_init.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/oprofile/common.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/oprofile/op_impl.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/oprofile/op_model_mipsxx.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/fixup-au1000.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/ops-pnx8550.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/sgi-ip32/ip32-reset.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4938/common/dbgio.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4938/common/prom.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4938/toshiba_rbtx4938/irq.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/tx4938/toshiba_rbtx4938/setup.c
View fileThis diff is incomplete. Download the complete patch.
drivers/ide/mips/au1xxx-ide.c
View fileThis diff is incomplete. Download the complete patch.
drivers/net/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/8250_au1x00.c
View before deletionThis diff is incomplete. Download the complete patch.
drivers/serial/Kconfig
View fileThis diff is incomplete. Download the complete patch.
drivers/serial/Makefile
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/cmp.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/cpu.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/dec/ioasic.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/ds1287.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/gcmpregs.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/gic.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/io.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/jmr3927/jmr3927.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/jmr3927/tx3927.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/jmr3927/txx927.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mach-au1x00/au1000.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mach-db1x00/db1200.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mach-generic/gpio.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mach-ip27/topology.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mach-pb1x00/pb1200.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mips-boards/generic.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mips-boards/launch.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mips-boards/malta.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mips-boards/maltaint.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mips-boards/maltasmp.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/mipsmtregs.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/pgtable-32.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/pgtable-bits.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/pgtable.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/r4k-timer.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/smp-ops.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/smtc.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/smvp.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/traps.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/tx4938/rbtx4938.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/tx4938/tx4938.h
View fileThis diff is incomplete. Download the complete patch.
include/asm-mips/tx4938/tx4938_mips.h
View before deletionThis diff is incomplete. Download the complete patch.
include/asm-mips/txx9pio.h
View fileThis diff is incomplete. Download the complete patch.