]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commit1811534a80697b34add31cff53a321cfc291ddfe
treeed4978f2fcf8565baf61afbe4b3d10187cf577a8
parentb62c855938be50c13f3f2aa81fafe4a9ca2b6650
parente6a1bb725eab1348d4a985b7faeff8186210d7b4
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.