From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jul 2008 16:51:51 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.26-rc9~59
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=638944adc169b3164399a7c1aa98bb48fa070e41;p=linux-2.6

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] Fix bug in atomic_sub_if_positive.
---

638944adc169b3164399a7c1aa98bb48fa070e41