]> 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>
Tue, 19 Apr 2011 18:24:06 +0000 (11:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Apr 2011 18:24:06 +0000 (11:24 -0700)
commitd29a3dfd7292cda94b140f8a7a88db1244b5e00e
treecb9d8b3cfc78d8411f0cea7b06c6472cdd35bb9a
parent60ef25b48107fcfa51b70db1bd10f675f42f874c
parentab30bcdcba3ceae1693107dd4eb65d94af37521c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c
net/ipv6/netfilter/ip6_tables.c
net/netfilter/ipvs/ip_vs_ctl.c