tree baafe3ad88c33b853acd81cff3745d45c2a26c2e
parent 297640e89ea21e314bdda45468e5f78c978dae16
parent c01003c20563d1e75ec9828d21743919d2b43977
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175199313 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175199313 -0700

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.