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

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

69e0386ba86a4875a0a59b937aa6a09dc5a1cdc4