Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls. MAINTAINERS: Change list for ioc_serial to linux-serial. SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure MIPS: jz4740: Fix Kbuild Platform file. MIPS: Repair Kbuild make clean breakage.
Showing
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/mips/Kbuild 4 additions, 0 deletionsarch/mips/Kbuild
- arch/mips/dec/Platform 1 addition, 1 deletionarch/mips/dec/Platform
- arch/mips/jz4740/Platform 1 addition, 1 deletionarch/mips/jz4740/Platform
- arch/mips/kernel/scall64-n32.S 3 additions, 3 deletionsarch/mips/kernel/scall64-n32.S
- arch/mips/kernel/scall64-o32.S 3 additions, 3 deletionsarch/mips/kernel/scall64-o32.S
- drivers/serial/ioc3_serial.c 1 addition, 0 deletionsdrivers/serial/ioc3_serial.c
Loading
Please register or sign in to comment