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.
This commit is contained in:
Linus Torvalds 2008-11-30 10:38:22 -08:00
commit 16799c6a4d