Merge branch 'v4.4/topic/mm-kaslr' into v4.4/topic/mm-kaslr-pax_usercopy
authorAlex Shi <alex.shi@linaro.org>
Wed, 22 Mar 2017 10:48:45 +0000 (18:48 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 22 Mar 2017 10:48:45 +0000 (18:48 +0800)

Trivial merge