Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git...

author David S. Miller <davem@davemloft.net>

Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)

committer David S. Miller <davem@davemloft.net>

Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
author David S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
committer David S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
diff --cc net/ipv4/arp.c
Simple merge
diff --cc net/ipv6/addrconf.c
Simple merge
diff --cc net/ipv6/ndisc.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
		1	2
net/ipv4/arp.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	patch \|	diff1 \|	diff2 \|	blob \| history