From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 10 Jul 2012 05:11:01 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/origin/develop-3.0' into develop-3.0-rk2928
X-Git-Tag: firefly_0821_release~8912^2~104
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3e3fca27c663e3f14f693638877bd94e5d278782;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'remotes/origin/develop-3.0' into develop-3.0-rk2928

Conflicts:
	arch/arm/plat-rk/Makefile
---

3e3fca27c663e3f14f693638877bd94e5d278782