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)
commit6381499f5898ef4144b1522cf35caab69d4d95eb
tree137dd5f1a5d35dcdb8f98b4346466f98bb1e6357
parenta057484ab40ff81f22a94bb62c035c78b5abd940
parenta34f0e8a2f8976f0bae4962edf2af4dd16cb85f7
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