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

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

Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)

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

Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
author Alex Shi <alex.shi@linaro.org>
Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
committer Alex Shi <alex.shi@linaro.org>
Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
diff --cc include/linux/sock_diag.h
Simple merge
diff --cc kernel/events/core.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
		1	2
include/linux/sock_diag.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history