From: Patrick McHardy Date: Mon, 8 Mar 2010 11:55:23 +0000 (+0100) Subject: Merge branch 'master' of /repos/git/linux-2.6 X-Git-Tag: v2.6.35-rc1~473^2~168^2~69^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f790c0ca6fad60b544bb73eda8cc841a6436725b;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'master' of /repos/git/linux-2.6 Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c Signed-off-by: Patrick McHardy --- f790c0ca6fad60b544bb73eda8cc841a6436725b