Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Mar 2007 20:15:13 +0000 (13:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Mar 2007 20:15:13 +0000 (13:15 -0700)
commit9415fddd99e12d57640774a3043a809140245c40
treebaafe3ad88c33b853acd81cff3745d45c2a26c2e
parent297640e89ea21e314bdda45468e5f78c978dae16
parentc01003c20563d1e75ec9828d21743919d2b43977
Merge /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.