diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-01 02:07:38 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-01 02:07:38 +0100 |
commit | 1811534a80697b34add31cff53a321cfc291ddfe (patch) | |
tree | ed4978f2fcf8565baf61afbe4b3d10187cf577a8 /init | |
parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [MIPS] Fix build. (diff) | |
download | linux-1811534a80697b34add31cff53a321cfc291ddfe.tar.xz linux-1811534a80697b34add31cff53a321cfc291ddfe.zip |
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 'init')
0 files changed, 0 insertions, 0 deletions