From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 23 Mar 2015 09:59:35 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~302
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a26084749b4fa2ea42705e5c3ed398b445e9c3ce;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10

Conflicts:
	arch/arm/mach-rockchip/dvfs.c
---

a26084749b4fa2ea42705e5c3ed398b445e9c3ce