From: David S. Miller Date: Mon, 9 Jul 2012 09:47:59 +0000 (-0700) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb3bb3a5b839fa5c0a2c386640e865320a1fb64c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso says: ==================== * One to get the timeout special parameter for the SET target back working (this was introduced while trying to fix another bug in 3.4) from Jozsef Kadlecsik. * One crash fix if containers and nf_conntrack are used reported by Hans Schillstrom by myself. ==================== Signed-off-by: David S. Miller --- bb3bb3a5b839fa5c0a2c386640e865320a1fb64c