]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Nov 2008 10:19:15 +0000 (02:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Nov 2008 10:19:15 +0000 (02:19 -0800)
commited77a89c30fa03dcb234a84ddea710b3fb7b62da
tree69f3e2c2bbf2fdd4f742e891441f01307d1d1f49
parent475ad8e2172d7f8b73af5532a8dad265b51339c2
parentd6e8cc6cc7ac77b0f9118f78c453a2e834e62709
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6

Conflicts:

net/netfilter/nf_conntrack_netlink.c
net/bridge/br_netfilter.c
net/ipv4/netfilter.c
net/ipv6/netfilter.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_netlink.c