From: eddie <cf@rock-chips.com>
Date: Wed, 24 Aug 2011 09:25:42 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~104
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f7b9e3f556f5c2a1ded299f1bae04d1ffefd5ea5;p=firefly-linux-kernel-4.4.55.git

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

f7b9e3f556f5c2a1ded299f1bae04d1ffefd5ea5