From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 3 Oct 2007 22:43:17 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.23~34
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7659e2c139d0be4647bef89188a932e0254d709;p=linux-2.6-omap-h63xx.git

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

c7659e2c139d0be4647bef89188a932e0254d709