Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Merge commit. Changes below are compared with the first parent: 1d63e726.
Changes
65 files changed · +3685 −621
Only the first 600 diff lines are shown. Download the complete patch.
arch/mips/Kconfig
View filearch/mips/Makefile
View filearch/mips/alchemy/common/platform.c
View filearch/mips/alchemy/pb1200/platform.c
View filearch/mips/configs/pnx8335-stb225_defconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/Kconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/common/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/common/prom.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/markeins/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/markeins/irq.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/markeins/led.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/markeins/platform.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma/markeins/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/emma2rh/common/irq.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/emma2rh/common/irq_emma2rh.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/emma2rh/markeins/irq.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/emma2rh/markeins/irq_markeins.c
View before deletionThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/emma/emma2rh.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/emma/markeins.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-lemote/pci.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-pnx833x/gpio.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-pnx833x/irq-mapping.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-pnx833x/irq.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-pnx833x/pnx833x.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-pnx833x/war.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mach-tx49xx/mangle-port.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/mipsregs.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/module.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/ptrace.h
View fileThis diff is incomplete. Download the complete patch.
arch/mips/include/asm/txx9/generic.h
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/scall32-o32.S
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/scall64-64.S
View fileThis diff is incomplete. Download the complete patch.
arch/mips/kernel/setup.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/unaligned.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/lemote/lm2e/pci.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/lemote/lm2e/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/lib/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/lib/dump_tlb.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/math-emu/cp1emu.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/dma-default.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/interrupts.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/platform.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/prom.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/reset.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/common/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/stb22x/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/nxp/pnx833x/stb22x/board.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/fixup-emma2rh.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/fixup-rc32434.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/ops-emma2rh.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/pci/pci-emma2rh.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/rb532/devices.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/rb532/gpio.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/sgi-ip22/ip22-int.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/txx9/Kconfig
View fileThis diff is incomplete. Download the complete patch.
arch/mips/txx9/generic/7segled.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/txx9/generic/Makefile
View fileThis diff is incomplete. Download the complete patch.
arch/mips/txx9/generic/setup.c
View fileThis diff is incomplete. Download the complete patch.
arch/mips/txx9/rbtx4939/setup.c
View fileThis diff is incomplete. Download the complete patch.
drivers/input/misc/sgi_btns.c
View fileThis diff is incomplete. Download the complete patch.