tree 7c7d3314b7bea5fe932eb76d80d9a102ffcda204
parent 531295e63be8c2b8b909d7400739e8b8df60d61f
parent e2cc502c3f71d8de812893527dc435e61b7fe604
author Linus Torvalds <torvalds@linux-foundation.org> 1287605901 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287605901 -0700

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.