From: 蔡枫 <cf@rock-chips.com>
Date: Thu, 21 Apr 2011 05:36:00 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10439
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=995cebcf8ab734d3ad28cb08f3b7db1bae34bb9b;p=firefly-linux-kernel-4.4.55.git

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

995cebcf8ab734d3ad28cb08f3b7db1bae34bb9b