]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)
commitd8ef17075b5bc1f379c16e5eba925c63d3f3f074
tree7c7d3314b7bea5fe932eb76d80d9a102ffcda204
parent2fc6d23ebf57349a0e4edfb93f5a0c57709d3c20
parent74ec7c3ec6b71445bbbdbd388528b00856987619
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.
MAINTAINERS
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S