From: David S. Miller Date: Mon, 14 Jan 2013 23:26:41 +0000 (-0500) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf X-Git-Tag: v3.8~69^2~57 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47fb3a26e2f07a734876915bedc1053021fec860;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso says: ==================== The following patchset contains netfilter fixes for 3.8-rc3, they are: * fix possible BUG_ON if several netns are in use and the nf_conntrack module is removed, initial patch from Gao feng, final patch from myself. * fix unset return value if conntrack zone are disabled at compile-time, reported by Borislav Petkov, fix from myself. * fix display error message via dmesg for arp_tables, from Jan Engelhardt. ==================== Signed-off-by: David S. Miller --- 47fb3a26e2f07a734876915bedc1053021fec860