Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Dec 2007 01:07:38 +0000 (17:07 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 1 Dec 2007 01:07:38 +0000 (17:07 -0800)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix build.
  [MIPS] Fix use of smp_processor_id() in preemptible code.


No differences found