From: root <root@eddie-desktop.(none)>
Date: Wed, 6 Jul 2011 07:06:30 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10141
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cec02a6d5358b91a1c324c4dd6923d203d61736;p=firefly-linux-kernel-4.4.55.git

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

5cec02a6d5358b91a1c324c4dd6923d203d61736