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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/bnx2x/bnx2x_cmn.c
This commit is contained in:
David S. Miller
2011-03-10 14:26:00 -08:00
parent c5908939b2 6dfbd87a20
commit 33175d84ee
167 changed files with 1275 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/sit.c
View File

@@ -1295,4 +1295,4 @@ static int __init sit_init(void)
module_init(sit_init);
module_exit(sit_cleanup);
MODULE_LICENSE("GPL");
MODULE_ALIAS("sit0");
MODULE_ALIAS_NETDEV("sit0");