]> 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>
Sat, 3 Jul 2010 05:42:06 +0000 (22:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Jul 2010 05:42:06 +0000 (22:42 -0700)
commitd611d0549b33e250a2239776c5d34a82cd413da0
tree132325ca88cc86a74345a93b2774c5ca284b038a
parentce3f547997b395a0edb59650383b58a42ae67305
parent58a863e1daf14a191472b5f3814edd1663bddc70
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
net/bridge/br_netfilter.c
net/bridge/br_private.h
net/netfilter/ipvs/ip_vs_conn.c