]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0553c89 a8a8a09)
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 patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/ipset/ip_set_core.c
Simple merge