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

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

Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)

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

Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)
author Alex Shi <alex.shi@linaro.org>
Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)
committer Alex Shi <alex.shi@linaro.org>
Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)
diff --cc drivers/base/power/main.c
Simple merge
diff --cc fs/ext4/ext4.h
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Mon, 28 Nov 2016 05:24:42 +0000 (13:24 +0800)
		1	2
drivers/base/power/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	patch \|	diff1 \|	diff2 \|	blob \| history