]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:10:36 +0000 (13:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:10:36 +0000 (13:10 -0700)
commit547af560ddbfe469ada2cad3009cbcfde313d73c
tree1f97e215de2d88d90ed34db24212dab69eb300b2
parentb0579fc089808b68c53a6a95d043db034468116c
parenta35bee8a2748abe9a40865f477aba0a9b85965fd
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: Enable ISA_DMA_API config to fix build failure
  MIPS: 32-bit: Fix build failure in asm/fcntl.h
  MIPS: Remove all generated vmlinuz* files on "make clean"
  MIPS: do_sigaltstack() expects userland pointers
  MIPS: Fix error values in case of bad_stack
  MIPS: Sanitize restart logics
  MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
  MIPS: Don't block signals if we'd failed to setup a sigframe
arch/mips/Kconfig
arch/mips/boot/compressed/Makefile
arch/mips/kernel/scall32-o32.S
arch/mips/kernel/scall64-64.S
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S