Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
commit30b9284db3c77a5e20bb826cd1b66ed7b26cb726
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 18:18:25 +0000 (17 14:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 18:18:25 +0000 (17 14:18 -0400)
tree95557fc43645512f91670b2e07dc6fabcc0a31fe
parent372b2312010bece1e36f577d6c99a6193ec54cbd
parente6e4d9ed11fb1fab8b3256a3dc14d71b5e984ac4
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
net/netfilter/nf_conntrack_sip.c