]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Apr 2011 18:28:35 +0000 (11:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Apr 2011 18:28:35 +0000 (11:28 -0700)
1  2 
net/netfilter/ipset/ip_set_core.c

Simple merge