Merge branch 'linaro-android-3.18-lsk' of...

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

* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  export tcp_nuke_addr to build ipv6 as module
  tcp: Fix build error if IPV6 is not selected