tree a351859ec431af6eb674a5305a5e7e1be4e766d6
parent 211f05a034f49586fdd071abd174853217ec29ee
parent 8ec2e24356e63dc298c6040557faf396410907ac
author Linus Torvalds <torvalds@linux-foundation.org> 1228070302 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228070302 -0800

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: Make BUG() __noreturn.