From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Nov 2008 18:38:22 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.28-rc7~58
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=16799c6a4d5156c6ee185b51b7586cca1aae0800

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.
---

16799c6a4d5156c6ee185b51b7586cca1aae0800