Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/netfilter/nfnetlink_log.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue.c
Simple merge