From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> Date: Tue, 20 Aug 2013 12:54:32 +0200 > The following batch contains Netfilter/IPVS updates for your net-next tree. > More specifically, they are: Pulled, but I had to resolve a conflict in the TCP conntrack code wrt. changing the type of a local variable to "s32" in net which I merged into net-next the other day. Look at the merge commit I pushed out, you'll see :-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
