Merge branch 'master' into net-next

author Stephen Hemminger <shemming@brocade.com>

Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)

committer Stephen Hemminger <shemming@brocade.com>

Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)
author Stephen Hemminger <shemming@brocade.com>
Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)
committer Stephen Hemminger <shemming@brocade.com>
Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)
diff --cc include/libnetlink.h
Simple merge
diff --cc ip/ipneigh.c
Simple merge
diff --cc lib/libnetlink.c
Simple merge
author	Stephen Hemminger <shemming@brocade.com>
	Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)
committer	Stephen Hemminger <shemming@brocade.com>
	Fri, 16 Oct 2015 23:03:32 +0000 (16:03 -0700)
		1	2
include/libnetlink.h	patch \|	diff1 \|	diff2 \|	blob \| history
ip/ipneigh.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/libnetlink.c	patch \|	diff1 \|	diff2 \|	blob \| history