Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 13 Jan 2017 04:01:52 +0000 (12:01 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 13 Jan 2017 04:01:52 +0000 (12:01 +0800)
1  2 
drivers/base/power/power.h
drivers/usb/gadget/composite.c
kernel/cpu.c

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