xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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/ipv4/ipip.c
View File

@@ -914,4 +914,4 @@ static void __exit ipip_fini(void)
module_init(ipip_init);
module_exit(ipip_fini);
MODULE_LICENSE("GPL");
MODULE_ALIAS("tunl0");
MODULE_ALIAS_NETDEV("tunl0");