| commit | f790c0ca6fad60b544bb73eda8cc841a6436725b | [log] [tgz] |
|---|---|---|
| author | Patrick McHardy <kaber@trash.net> | Mon Mar 08 12:55:23 2010 +0100 |
| committer | Patrick McHardy <kaber@trash.net> | Mon Mar 08 12:55:23 2010 +0100 |
| tree | 171052d4734fda5e77668aacfff98de69e1f4237 | |
| parent | 9ab48ddcb144fdee908708669448dd136cf4894a [diff] | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 [diff] |
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>