Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:37:42 +0000 (07:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 14:37:42 +0000 (07:37 -0700)
* '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.


Trivial merge