From: 蔡枫 <cf@rock-chips.com>
Date: Thu, 28 Jul 2011 08:12:24 +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~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d719db392b3026d0cf03414808040831b68c1cd4;p=firefly-linux-kernel-4.4.55.git

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

d719db392b3026d0cf03414808040831b68c1cd4