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)
commit138f2c357e124fa8e676e6f27cc986c3ce320130
treee0aca2935ad712a92f74025bbccac8583556e79d
parent2bf7955152a0544342fcaed28930748cc68392ae
parent1a1a512b983108015ced1e7a7c7775cfeec42d8c
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
drivers/base/power/opp/core.c