Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:43:17 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:43:17 +0000 (15:43 -0700)
commitc7659e2c139d0be4647bef89188a932e0254d709
tree7af831479e9369852f05f6feec07ee7d51e57bc8
parent66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4
parent9ea0f043fec38fadb0101fbf29563a5635f42e93
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Terminally fix local_{dec,sub}_if_positive
  [MIPS] Type proof reimplementation of cmpxchg.
  [MIPS] pg-r4k.c: Fix a typo in an R4600 v2 erratum workaround