Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 20 Dec 2016 05:48:11 +0000 (13:48 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 20 Dec 2016 05:48:11 +0000 (13:48 +0800)
1  2 
include/linux/cpu.h
kernel/cpu.c

Simple merge
diff --cc kernel/cpu.c
Simple merge