From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2009 14:37:42 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.30-rc7~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=afc2788736d168fdad71d5ba24ba278b959e3178;p=~shefty%2Frdma-dev.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Remove unnecessary if not even harmful volatile keywords.
  MIPS: IP32: Fix build error due to uninitialized variable.
  MIPS: Fix sparse warning in incompatiable argument type of clear_user.
---

afc2788736d168fdad71d5ba24ba278b959e3178