From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 1 Dec 2007 01:07:38 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.24-rc4~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1811534a80697b34add31cff53a321cfc291ddfe;p=linux-2.6

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] Fix build.
  [MIPS] Fix use of smp_processor_id() in preemptible code.
---

1811534a80697b34add31cff53a321cfc291ddfe