git.stricted.de - GitHub/LineageOS/android_kernel_samsung

author	David S. Miller <davem@davemloft.net>
	Fri, 28 Nov 2008 10:19:15 +0000 (02:19 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 28 Nov 2008 10:19:15 +0000 (02:19 -0800)
commit	ed77a89c30fa03dcb234a84ddea710b3fb7b62da
tree	69f3e2c2bbf2fdd4f742e891441f01307d1d1f49	tree \| snapshot (tar.gz zip)
parent	475ad8e2172d7f8b73af5532a8dad265b51339c2	commit \| diff
parent	d6e8cc6cc7ac77b0f9118f78c453a2e834e62709	commit \| diff

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

Conflicts:

net/netfilter/nf_conntrack_netlink.c

net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_helper.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history