From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 5 May 2016 05:25:02 +0000 (+0800)
Subject: Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
X-Git-Tag: firefly_0821_release~176^2~4^2~48
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=138f2c357e124fa8e676e6f27cc986c3ce320130;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

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

138f2c357e124fa8e676e6f27cc986c3ce320130