summaryrefslogtreecommitdiff
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:39:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-02 15:39:20 -0800
commit86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab (patch)
tree65e4bd2c4995f7a3e4f97f57c937220fbb4404c4 /init/main.c
parentbbbb45a02ba1c4dcec2fe2b5531750d6616765b9 (diff)
parent4e7c81af3fa076e2d1534cc665ea2f623e631f5d (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: RB532: Fix devices.c compilation. MIPS: Fix MIPS I build.
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions