Merge remote-tracking branch 'origin/v4.4/topic/OPPv2' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Fri, 8 Apr 2016 05:59:30 +0000 (13:59 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 8 Apr 2016 05:59:30 +0000 (13:59 +0800)

Trivial merge