git » linux-kernel » commit 86a7b7e

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

author Linus Torvalds
2009-12-02 23:39:20 UTC
committer Linus Torvalds
2009-12-02 23:39:20 UTC
parent bbbb45a02ba1c4dcec2fe2b5531750d6616765b9
parent 4e7c81af3fa076e2d1534cc665ea2f623e631f5d
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.