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)
commit16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8
treea1041342f31a626baf3a08d09d5c81a65dd8ef28
parenta3433f35a55f7604742cae620c6dc6edfc70db6a
parentf9181f4ffc71d7b7dd1906c9a11d51d6659220ae
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6
net/bridge/br_netfilter.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c