]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 46c3b5a) | 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)
commit0ee3491b9159a4184fa85cb365d026f24c393b2d
tree46ad1f5106df4a02d54366194653502b0c8c2497tree | snapshot
parent46c3b5adb756f08fb04305523e77f36500687411commit | diff
bnx2: Fix bnx2_netif_stop() merge error.

The error was introduced while merging:

commit 1a40e2d9dae6cd1ee335d3bba73106bca4da6fe9
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
Linux Kernel Source Tree.