diff --git a/[refs] b/[refs]
index 1a01aefa91ba..d36047279b33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da6a738ffdb99b88efbe5b4c4fe521ca453640d
+refs/heads/master: 8afe7c8acd33bc52c56546e73e46e9d546269e2c
diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c
index e70ad581398e..988f52fba54a 100644
--- a/trunk/net/ipv4/ipip.c
+++ b/trunk/net/ipv4/ipip.c
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
 module_init(ipip_init);
 module_exit(ipip_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");