From: Patrick McHardy <kaber@trash.net>
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: https://repo.jachan.dev/linux.git/commitdiff_plain/f790c0ca6fad60b544bb73eda8cc841a6436725b

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 <kaber@trash.net>
---

f790c0ca6fad60b544bb73eda8cc841a6436725b