From: 蔡枫 <cf@rock-chips.com>
Date: Tue, 9 Aug 2011 13:03:51 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~18^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2f2b23a302549abb102b92d5b3b8aeb6264ace22;p=firefly-linux-kernel-4.4.55.git

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

2f2b23a302549abb102b92d5b3b8aeb6264ace22