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

2011-03-10 14:00:44 -08:00
parent dcbcdf22f5 9179746652
commit bef6e7e768
149 changed files with 1159 additions and 472 deletions
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1290,4 +1290,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");