Merge tag 'lsk-v4.4-arm64-v4.8-kaslr-updates' of git://git.linaro.org/people/ard...
authorAlex Shi <alex.shi@linaro.org>
Mon, 15 Aug 2016 09:42:55 +0000 (17:42 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 15 Aug 2016 09:42:55 +0000 (17:42 +0800)

Trivial merge