]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 531295e e2cc502)
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)
* '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.

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/mips/kernel/scall64-n32.S patch | diff1 | diff2 | blob | history
arch/mips/kernel/scall64-o32.S patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/mips/kernel/scall64-n32.S
Simple merge
diff --cc arch/mips/kernel/scall64-o32.S
Simple merge
Clone of davem's net-next-2.6 tree