diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 13:18:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 13:18:21 -0700 |
| commit | 7d7c4d06be246b249f0f7e0b7df2f73d09cc6376 (patch) | |
| tree | 7c7d3314b7bea5fe932eb76d80d9a102ffcda204 /MAINTAINERS | |
| 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 | linux-dev-7d7c4d06be246b249f0f7e0b7df2f73d09cc6376.tar.xz linux-dev-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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7679bf32f7bb..f2a2b8e647c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3162,7 +3162,7 @@ F: drivers/net/ioc3-eth.c IOC3 SERIAL DRIVER M: Pat Gefre <pfg@sgi.com> -L: linux-mips@linux-mips.org +L: linux-serial@vger.kernel.org S: Maintained F: drivers/serial/ioc3_serial.c |