From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 6 Dec 2007 17:43:26 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.24-rc5~59
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ceaeee6ad6c2a24bf37d9f426414cf3007432352;p=~shefty%2Frdma-dev.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:
  [MIPS] Oprofile: Fix computation of number of counters.
  [MIPS] Alchemy: fix IRQ bases
  [MIPS] Alchemy: replace ffs() with __ffs()
  [MIPS] BCM1480: Fix interrupt routing, take 2.
---

ceaeee6ad6c2a24bf37d9f426414cf3007432352