diff options
author | Linus Torvalds | 2010-10-20 22:18:21 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-10-20 22:18:21 +0200 |
commit | 7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch) | |
tree | 7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /arch/mips/cavium-octeon | |
parent | virtio: console: Don't block entire guest if host doesn't read data (diff) | |
parent | MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls. (diff) | |
download | kernel-qcow2-linux-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.gz kernel-qcow2-linux-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.xz kernel-qcow2-linux-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.zip |
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.
Diffstat (limited to 'arch/mips/cavium-octeon')
0 files changed, 0 insertions, 0 deletions