tree 494848d1504162438e00fcc682baec9bdb6d4785
parent 5c0a95c73f80c034914e219eee8075acdf56b527
parent 6b3766a263a62fc82ca0457faa73dc34b98ceb87
author Linus Torvalds <torvalds@linux-foundation.org> 1222026030 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222026030 -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] vmlinux.lds.S: handle .text.*
  [MIPS] Fix potential latency problem due to non-atomic cpu_wait.
  [MIPS] SMTC: Clear TIF_FPUBOUND on clone / fork.
  [MIPS] Fix 64-bit IP checksum code