Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
David S. Miller [Tue, 15 Jun 2010 20:49:24 +0000 (13:49 -0700)]
1  2 
net/bridge/br_netfilter.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c

Simple merge
Simple merge
Simple merge