]> 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, 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)
commitef3385efdc461264ba189e584f489f02296d2e64
tree1a55442d61782eabab5682f9a10b4d8694ae650e
parent67ac37f0b12f769853f42620ddbd0c52a5da9170
parente9f28176c74d27f05e2dfc6e21da79626ee30a0b
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
net/netfilter/nf_conntrack_netlink.c