From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Oct 2010 20:10:36 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.36~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=547af560ddbfe469ada2cad3009cbcfde313d73c;p=~emulex%2Finfiniband.git

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
---

547af560ddbfe469ada2cad3009cbcfde313d73c