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)
commite490c1defec4236a6a131fe2d13bf7ba787c02f8
tree132325ca88cc86a74345a93b2774c5ca284b038a
parent0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba
parent4df53d8bab65cf2c18daebd51a5a4847e03f1943
Merge branch 'master' of git://git./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