From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 29 Mar 2007 20:15:13 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc6~48
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9415fddd99e12d57640774a3043a809140245c40;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IFB]: Fix crash on input device removal
  [BNX2]: Fix link interrupt problem.
---

9415fddd99e12d57640774a3043a809140245c40