Merge branch 'master' of /repos/git/linux-2.6
authorPatrick McHardy <kaber@trash.net>
Mon, 8 Mar 2010 11:55:23 +0000 (12:55 +0100)
committerPatrick McHardy <kaber@trash.net>
Mon, 8 Mar 2010 11:55:23 +0000 (12:55 +0100)
commitf790c0ca6fad60b544bb73eda8cc841a6436725b
tree171052d4734fda5e77668aacfff98de69e1f4237
parent9ab48ddcb144fdee908708669448dd136cf4894a
parent25cf84cf377c0aae5dbcf937ea89bc7893db5176
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>