]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7d7c4d06be246b249f0f7e0b7df2f73d09cc6376
tree7c7d3314b7bea5fe932eb76d80d9a102ffcda204tree | snapshot (tar.bz2 tar.gz zip)
parent531295e63be8c2b8b909d7400739e8b8df60d61fcommit | diff
parente2cc502c3f71d8de812893527dc435e61b7fe604commit | diff
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 diff1 | diff2 | blob | history
arch/mips/kernel/scall64-n32.S diff1 | diff2 | blob | history
arch/mips/kernel/scall64-o32.S diff1 | diff2 | blob | history
Clone of davem's net-next-2.6 tree