Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (21 commits) [MIPS] Remove unused maltasmp.h. [MIPS] Remove unused saa9730_uart.h. [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. [MIPS] TXx9: Fix some sparse warnings [MIPS] TXx9: Add 64-bit support [MIPS] TXx9: Cleanups for 64-bit support [MIPS] Cobalt: Fix I/O port resource range [MIPS] don't leak setup_early_printk() in userspace header [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build [MIPS] TXx9: Miscellaneous build fixes [MIPS] Routerboard 532: Support for base system [MIPS] IP32: Use common SGI button driver [MIPS] IP22: Use common SGI button driver [MIPS] IP22, IP28: Fix merge bug [MIPS] Tinker with constraints in <asm/atomic.h> to fix build error. [MIPS] Add missing prototypes to asm/page.h [MIPS] Fix missing prototypes in asm/fpu.h ...
No related branches found
No related tags found
Showing
- arch/mips/Kconfig 20 additions, 2 deletionsarch/mips/Kconfig
- arch/mips/Makefile 7 additions, 0 deletionsarch/mips/Makefile
- arch/mips/cobalt/setup.c 2 additions, 2 deletionsarch/mips/cobalt/setup.c
- arch/mips/configs/rb532_defconfig 1314 additions, 0 deletionsarch/mips/configs/rb532_defconfig
- arch/mips/kernel/linux32.c 0 additions, 17 deletionsarch/mips/kernel/linux32.c
- arch/mips/kernel/scall32-o32.S 1 addition, 1 deletionarch/mips/kernel/scall32-o32.S
- arch/mips/kernel/scall64-64.S 1 addition, 1 deletionarch/mips/kernel/scall64-64.S
- arch/mips/kernel/scall64-n32.S 1 addition, 1 deletionarch/mips/kernel/scall64-n32.S
- arch/mips/kernel/scall64-o32.S 1 addition, 1 deletionarch/mips/kernel/scall64-o32.S
- arch/mips/kernel/syscall.c 8 additions, 1 deletionarch/mips/kernel/syscall.c
- arch/mips/math-emu/kernel_linkage.c 1 addition, 0 deletionsarch/mips/math-emu/kernel_linkage.c
- arch/mips/pci/Makefile 1 addition, 0 deletionsarch/mips/pci/Makefile
- arch/mips/pci/fixup-rc32434.c 69 additions, 0 deletionsarch/mips/pci/fixup-rc32434.c
- arch/mips/pci/ops-rc32434.c 207 additions, 0 deletionsarch/mips/pci/ops-rc32434.c
- arch/mips/pci/pci-rc32434.c 221 additions, 0 deletionsarch/mips/pci/pci-rc32434.c
- arch/mips/pci/pci.c 1 addition, 1 deletionarch/mips/pci/pci.c
- arch/mips/rb532/Makefile 7 additions, 0 deletionsarch/mips/rb532/Makefile
- arch/mips/rb532/devices.c 331 additions, 0 deletionsarch/mips/rb532/devices.c
- arch/mips/rb532/gpio.c 220 additions, 0 deletionsarch/mips/rb532/gpio.c
- arch/mips/rb532/irq.c 209 additions, 0 deletionsarch/mips/rb532/irq.c
Loading
Please register or sign in to comment