From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Feb 2009 00:48:33 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.29-rc7~23
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7187adbf08336bd69da11d42d2542de7b1cc6957;p=~emulex%2Finfiniband.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  Revert "MIPS: Print irq handler description"
  MIPS: CVE-2009-0029: Enable syscall wrappers.
  MIPS: Alchemy: In plat_time_init() t reaches -1, tested: 0
  MIPS: Only allow Cavium OCTEON to be configured for boards that support it
---

7187adbf08336bd69da11d42d2542de7b1cc6957