From: yangkai <yk@rock-chips.com>
Date: Sat, 1 Sep 2012 06:52:05 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~8767
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be17642a4f993f8b617ee98697ad139971074f1f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
---

be17642a4f993f8b617ee98697ad139971074f1f