Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Thu, 5 May 2016 05:25:02 +0000 (13:25 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 5 May 2016 05:25:02 +0000 (13:25 +0800)
Conflicts:
drivers/base/power/opp/core.c


Trivial merge