From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 13 Oct 2007 17:14:25 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.24-rc1~1362
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ffb035591f2736921d5dadcf8597bc1da1ba71e5;p=linux.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] SMP: Fix use of cpumasks.
  [MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
  [MIPS] CFE: Add missing parenthesis.
---

ffb035591f2736921d5dadcf8597bc1da1ba71e5