Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 21:42:08 +0000 (13:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Dec 2008 21:42:08 +0000 (13:42 -0800)
commit24920a79a27dd28e67088bbfcf36746d15587f4d
tree2915c6ab589ba8ec639c2f80d21086d3d5c20400
parent2289e6643660601d3b21a22effd04dcca27775e4
parent8ebcfc8bcb55261cf01fc302d707fbba46242bf1
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix incorrect use of loose in vpe.c