From: David S. Miller Date: Fri, 19 Apr 2013 18:24:47 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd7fc253289c419615c1c8bbe418598019567392;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== If time allows, please consider pulling the following patchset contains two late Netfilter fixes, they are: * Skip broadcast/multicast locally generated traffic in the rpfilter, (closes netfilter bugzilla #814), from Florian Westphal. * Fix missing elements in the listing of ipset bitmap ip,mac set type with timeout support enabled, from Jozsef Kadlecsik. ==================== Signed-off-by: David S. Miller --- fd7fc253289c419615c1c8bbe418598019567392