Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Dec 2009 23:39:20 +0000 (15:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Dec 2009 23:39:20 +0000 (15:39 -0800)
commit86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab
tree65e4bd2c4995f7a3e4f97f57c937220fbb4404c4
parentbbbb45a02ba1c4dcec2fe2b5531750d6616765b9
parent4e7c81af3fa076e2d1534cc665ea2f623e631f5d
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: RB532: Fix devices.c compilation.
  MIPS: Fix MIPS I build.