]> git.baikalelectronics.ru Git - kernel.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)
commit7986f9dedf02e68f8a72009ce448354a61541fb9
tree69f3e2c2bbf2fdd4f742e891441f01307d1d1f49
parent92b4b180f220b9ccad2aa8fad6f79c462dc530a0
parent6f6ed6e2aea8eed65c1f0c3068df6d60403a3342
Merge branch 'master' of git://git.kernel.org/pub/scm/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