From: zhaoyifeng <zyf@ubuntu-fs.(none)>
Date: Thu, 30 Dec 2010 04:00:18 +0000 (+0800)
Subject: Merge branch 'develop' of zyf@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10862
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3a6adafd8204351d9677514f676634d26f6c7a0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop' of zyf@10.10.10.29:/home/rockchip/kernel into develop
---

d3a6adafd8204351d9677514f676634d26f6c7a0