Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 0dd54a69dace255fcdf54732d982e8c521c574a5..12669411685290d6acf512061cafaf35257719d9 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6096,7 +6096,7 @@ static void __net_exit default_device_exit(struct net *net)
 static void __net_exit default_device_exit_batch(struct list_head *net_list)
 {
        /* At exit all network devices most be removed from a network
-        * namespace.  Do this in the reverse order of registeration.
+        * namespace.  Do this in the reverse order of registration.
         * Do this across as many network namespaces as possible to
         * improve batching efficiency.
         */