Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7921d1abc449f0924eac2f8c58972fa31a44dd42..089a948fe83441586259d39fa7939d5ee3416f0d 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3565,3 +3565,4 @@ restart:
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(tcp_nuke_addr);