summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2009-12-20 18:40:18 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-20 18:40:18 -0800
commitb74665606962456af7f92b1e448cee30ce70967b (patch)
tree46ad1f5106df4a02d54366194653502b0c8c2497 /arch/arm/mach-omap2
parent7c65ec7958f4f301d5d2ff50476a21e7735c73e8 (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>
Diffstat (limited to 'arch/arm/mach-omap2')
0 files changed, 0 insertions, 0 deletions