From: David S. Miller Date: Fri, 19 Apr 2013 21:55:29 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next X-Git-Tag: upstream/snapshot3+hdmi~5164^2~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95a06161e6b903ad5b96285cb57c8df3b7c8ad34;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf-next Pablo Neira Ayuso says: ==================== The following patchset contains a small batch of Netfilter updates for your net-next tree, they are: * Three patches that provide more accurate error reporting to user-space, instead of -EPERM, in IPv4/IPv6 netfilter re-routing code and NAT, from Patrick McHardy. * Update copyright statements in Netfilter filters of Patrick McHardy, from himself. * Add Kconfig dependency on the raw/mangle tables to the rpfilter, from Florian Westphal. ==================== Signed-off-by: David S. Miller --- 95a06161e6b903ad5b96285cb57c8df3b7c8ad34