Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 13 Oct 2007 17:14:25 +0000 (10:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 13 Oct 2007 17:14:25 +0000 (10:14 -0700)
commitffb035591f2736921d5dadcf8597bc1da1ba71e5
tree1751005ff69b6b1e55325c45c65c9e83e2a5adf0
parentbcd11eaa222fce31d0b59cdbfdf9b8c47067f15a
parentece8a9e4f011b038396c7649a8407ca9171be4a9
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] SMP: Fix use of cpumasks.
  [MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
  [MIPS] CFE: Add missing parenthesis.