projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 372b231 e6e4d9e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 18:18:25 +0000 (14:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 18:18:25 +0000 (14:18 -0400)
1  2 
net/netfilter/nf_conntrack_sip.c patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/nf_conntrack_sip.c
Simple merge
John Crispins staging tree