]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4f7734b738eec1db02030fc865e76dc825b36cbc
tree95557fc43645512f91670b2e07dc6fabcc0a31fe
parent7f0d52b1a8366003b78ff090119d7a897118b631
parent0b0dcd20b5ce916583c99bb851f7372ec95059e2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
net/netfilter/nf_conntrack_sip.c