Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:31:58 +0000 (17:31 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:31:58 +0000 (17:31 +0800)
commitd15d03841809adb217b813f88fa4f0adccc27169
treeeeb6251df9bb235eaf96721517b1e52116cb98bf
parentf63c6ea120f4858672df5f6ea926233e4fea335a
parentbe90e260145c0463c7a5c80ced379adc2f4850cc
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
arch/arm/kernel/Makefile
arch/x86/kernel/ftrace.c