Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/barrier.h
	arch/arm64/include/asm/elf.h
	arch/arm64/include/asm/ptrace.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/debug-monitors.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/hw_breakpoint.c
	arch/arm64/kernel/kuser32.S
	arch/arm64/kernel/ptrace.c
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/traps.c
	kernel/fork.c

1 files changed, 1 insertions, 0 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 4619ae6c5d50..aabb52855662 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3585,3 +3585,4 @@ restart:
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(tcp_nuke_addr);