From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 19 Sep 2007 18:45:32 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23-rc7~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a88a8eff1e6e32d3288986a9d36c6a449c032d3a;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] cpu-bugs64.c: GCC 3.3 constraint workaround
  [MIPS] DEC: Initialise ioasic_ssr_lock
---

a88a8eff1e6e32d3288986a9d36c6a449c032d3a