tree 65e4bd2c4995f7a3e4f97f57c937220fbb4404c4
parent bbbb45a02ba1c4dcec2fe2b5531750d6616765b9
parent 4e7c81af3fa076e2d1534cc665ea2f623e631f5d
author Linus Torvalds <torvalds@linux-foundation.org> 1259797160 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1259797160 -0800

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.