From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 20 Dec 2016 05:47:14 +0000 (+0800)
Subject: Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
X-Git-Tag: firefly_0821_release~176^2~4^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6381499f5898ef4144b1522cf35caab69d4d95eb;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
	replaced with _ASM_EXTABLE() in arch/arm64/include/asm/futex.h
---

6381499f5898ef4144b1522cf35caab69d4d95eb