lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source 
Conflicts:
	include/net/tcp.h
This commit is contained in:
David S. Miller
2009-12-11 17:12:17 -08:00
parent e93737b0f0 2fe77b81c7
commit 501706565b
3064 changed files with 331360 additions and 222640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/atl1c/atl1c_main.c
View File

@@ -1541,7 +1541,7 @@ static irqreturn_t atl1c_intr(int irq, void *data)
if (status & ISR_OVER)
if (netif_msg_intr(adapter))
dev_warn(&pdev->dev,
"TX/RX over flow (status = 0x%x)\n",
"TX/RX overflow (status = 0x%x)\n",
status & ISR_OVER);
/* link event */