Merge "defconfig: msm8960: enable IPv6 netfilter config" into msm-3.0