Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:23:29 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:23:29 +0000 (10:23 -0800)
commit2ba16c4f456eb63f54b1d8b065377d41a1cd6a14
tree9d3ac965a867d5b6e6950dee8efba7cb5d61621d
parent46bdfe6a50b88942f5323f837a3afd93a1c86e60
parent081d835fa4ce70ad1e42ac76de850a49e23a1557
Merge branch 'upstream' of git://git.linux-mips.org/upstream-linus

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix build errors in sc-mips.c