Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

author Alex Shi <alex.shi@linaro.org>

Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)

committer Alex Shi <alex.shi@linaro.org>

Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)
author Alex Shi <alex.shi@linaro.org>
Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)
committer Alex Shi <alex.shi@linaro.org>
Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)
diff --cc net/ipv4/route.c
Simple merge
diff --cc net/ipv6/addrconf.c
Simple merge
diff --cc net/ipv6/route.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Mon, 6 Feb 2017 04:03:08 +0000 (12:03 +0800)
		1	2
net/ipv4/route.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	patch \|	diff1 \|	diff2 \|	blob \| history