From: ddl <ddl@rock-chips.com>
Date: Thu, 23 Aug 2012 02:44:41 +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~8862
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0131a591e4fa61baab508e99ffcdebe0dd6c53fc;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
---

0131a591e4fa61baab508e99ffcdebe0dd6c53fc