tree 70f09ef2b5af667aaf5b60de2dc9697003ab106c
parent 3ea9eed49346eb80f17f1c6539c47dc508be1173
parent 50952026036c7b4212b90091bf23a264c0ccc1fb
author Linus Torvalds <torvalds@linux-foundation.org> 1215190311 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215190311 -0700

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.