diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 00:39:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-03 00:39:20 +0100 |
| commit | 86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab (patch) | |
| tree | 65e4bd2c4995f7a3e4f97f57c937220fbb4404c4 /init/main.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | MIPS: RB532: Fix devices.c compilation. (diff) | |
| download | linux-86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab.tar.xz linux-86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab.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: RB532: Fix devices.c compilation.
MIPS: Fix MIPS I build.
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions