Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 May 2012 05:02:40 +0000 (01:02 -0400)
commitc727e7f0071cae66c029f667d48b154c6b64227b
tree197c2760fcae529d04d56f56e9cd55f51d6d9273
parent91df42bedccb919902c7cf7eb876c982ae7f1b1d
parentee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d
Merge branch 'delete-tokenring' of git://git./linux/kernel/git/paulg/linux
net/ipv4/arp.c
net/ipv6/addrconf.c
net/ipv6/ndisc.c