From: Pablo Neira Ayuso Date: Wed, 17 Oct 2012 08:59:20 +0000 (+0200) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Tag: v3.7-rc3~7^2~32^2~1 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=0b4f5b1d6385826093dc3cd9035b186f0d77a5dc Merge branch 'master' of git://git./linux/kernel/git/davem/net To obtain new flag FLOWI_FLAG_KNOWN_NH to fix netfilter's xt_TEE target. --- 0b4f5b1d6385826093dc3cd9035b186f0d77a5dc