From: cmc <cmc@rock-chips.com>
Date: Thu, 24 Feb 2011 01:31:25 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10756
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0c87da3b526e76839f7ea0d96ff7caad578dd0d;p=firefly-linux-kernel-4.4.55.git

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

d0c87da3b526e76839f7ea0d96ff7caad578dd0d