From: 蔡枫 <cf@rock-chips.com>
Date: Tue, 19 Apr 2011 03:39:43 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10456
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8c4800392fd66306660e63b75c24400c54da0633;p=firefly-linux-kernel-4.4.55.git

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

8c4800392fd66306660e63b75c24400c54da0633