git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7c65ec7) | patch
bnx2: Fix bnx2_netif_stop() merge error.
authorMichael Chan <mchan@broadcom.com>
Mon, 21 Dec 2009 02:40:18 +0000 (18:40 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Dec 2009 02:40:18 +0000 (18:40 -0800)
commitb74665606962456af7f92b1e448cee30ce70967b
tree46ad1f5106df4a02d54366194653502b0c8c2497tree | snapshot
parent7c65ec7958f4f301d5d2ff50476a21e7735c73e8commit | diff
bnx2: Fix bnx2_netif_stop() merge error.

The error was introduced while merging:

commit 4529819c45161e4a119134f56ef504e69420bc98
bnx2: reset_task is crashing the kernel. Fixing it.

Signed-off-by: Michael Chan <mchan@broadcom.com>k
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.c diff | blob | history
Full containers within linux kernel