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)
commit0b0dc0f17f98b59772ca6380c7d5ce4cc593a974
tree1f1248a3402d519f522efaf91b68c8f85e2436bc
parent0553c891fabd287726b41076cfd03fe7e5ab596f
parenta8a8a0937e22a5fd55aeb22586724ba6bb70aadd
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
net/netfilter/ipset/ip_set_core.c