commit | e4c6d3c6b14bd20fb8087acd51b29ee54a66ef77 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 07 13:31:03 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 07 13:31:03 2008 -0800 |
tree | c12d82ac4bb18d68e284e782919b6a925298f44f | |
parent | 89a30a8388c9592579f237bc06988808f2c454d4 [diff] | |
parent | ba820c5c51296343be202c9afb072b7b943099cb [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 CONFIG_BOOT_RAW. [MIPS] Assume R4000/R4400 newer than 3.0 don't have the mfc0 count bug [MIPS] Fix IP32 breakage [MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place