Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Tue, 20 Dec 2016 05:47:14 +0000 (13:47 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 20 Dec 2016 05:47:14 +0000 (13:47 +0800)
Conflicts:
replaced with _ASM_EXTABLE() in arch/arm64/include/asm/futex.h


Trivial merge