Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Wed, 19 Apr 2017 04:02:46 +0000 (12:02 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 19 Apr 2017 04:02:46 +0000 (12:02 +0800)
1  2 
Makefile

diff --cc Makefile
Simple merge