Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 18:38:22 +0000 (10:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 18:38:22 +0000 (10:38 -0800)
commit16799c6a4d5156c6ee185b51b7586cca1aae0800
treea351859ec431af6eb674a5305a5e7e1be4e766d6
parent211f05a034f49586fdd071abd174853217ec29ee
parent8ec2e24356e63dc298c6040557faf396410907ac
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Make BUG() __noreturn.