From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Dec 2009 23:39:20 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.32~7
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab

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.
---

86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab