Merge branch 'v4.4/topic/OPPv2' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Fri, 24 Mar 2017 03:26:58 +0000 (11:26 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 24 Mar 2017 03:26:58 +0000 (11:26 +0800)

Trivial merge