Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2009 19:00:53 +0000 (12:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2009 19:00:53 +0000 (12:00 -0700)
commit356d6c2d55b71303a17910ea2cce3eba8e44bd29
tree1a55442d61782eabab5682f9a10b4d8694ae650e
parent86b698b8cba723fc7e7db50f664ccf0d7da57ee1
parentfecc1133b66af6e0cd49115a248f34bbb01f180a
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
net/netfilter/nf_conntrack_netlink.c