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

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

Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)

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

Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)
author Alex Shi <alex.shi@linaro.org>
Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)
committer Alex Shi <alex.shi@linaro.org>
Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc net/socket.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Mon, 27 Feb 2017 04:00:54 +0000 (12:00 +0800)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
net/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history