Merge tag 'v3.10.89' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Documentation / networking / fib_trie.txt

diff --git a/Documentation/networking/fib_trie.txt b/Documentation/networking/fib_trie.txt
index f50d0c673c57e52682d9471b220e0b282f875737..0723db7f8495a1a0466ae06cd311c3e72ce24337 100644 (file)
--- a/Documentation/networking/fib_trie.txt
+++ b/Documentation/networking/fib_trie.txt
@@ -79,7 +79,7 @@ trie_rebalance()
 
 resize()
        Analyzes a tnode and optimizes the child array size by either inflating
-       or shrinking it repeatedly until it fullfills the criteria for optimal
+       or shrinking it repeatedly until it fulfills the criteria for optimal
        level compression. This part follows the original paper pretty closely
        and there may be some room for experimentation here.