git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7c65ec7)
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)
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>

No differences found
Pandora Kernel Repository