]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 20:49:24 +0000 (13:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 20:49:24 +0000 (13:49 -0700)
commit7e7f0361d8def9eec841c039df0ace4b56217578
treea1041342f31a626baf3a08d09d5c81a65dd8ef28
parent7321c508b35fbb321005d6bd333effcc1e387706
parent1681934c890cc4482b7c88a172d019256eb1d7d1
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
net/bridge/br_netfilter.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c