Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[pandora-kernel.git] / net / ipv6 / addrconf.c
Simple merge