diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-30 17:07:38 -0800 |
commit | 1811534a80697b34add31cff53a321cfc291ddfe (patch) | |
tree | ed4978f2fcf8565baf61afbe4b3d10187cf577a8 /arch/powerpc/kernel | |
parent | b62c855938be50c13f3f2aa81fafe4a9ca2b6650 (diff) | |
parent | e6a1bb725eab1348d4a985b7faeff8186210d7b4 (diff) |
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.
Diffstat (limited to 'arch/powerpc/kernel')
0 files changed, 0 insertions, 0 deletions