Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 30 Aug 2016 02:27:13 +0000 (10:27 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 30 Aug 2016 02:27:13 +0000 (10:27 +0800)
commitb56111f481e16510558a892d5d56cb90cadd96c0
treebfca590ae8c2e8be7a7c44faba15ae3fd548f925
parentb8060c794f53e364a967ce483cef8e86f4006a61
parent59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
arch/arm/Kconfig
arch/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/x86/Kconfig
security/Kconfig