Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2008 16:51:51 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2008 16:51:51 +0000 (09:51 -0700)
commit638944adc169b3164399a7c1aa98bb48fa070e41
tree70f09ef2b5af667aaf5b60de2dc9697003ab106c
parent3ea9eed49346eb80f17f1c6539c47dc508be1173
parent50952026036c7b4212b90091bf23a264c0ccc1fb
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix bug in atomic_sub_if_positive.