From: lzg <lzg@rockchip.com>
Date: Fri, 12 Aug 2011 08:00:39 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~21^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ccf70001a61070ef0ae081b7ce7bcbffea0291df;p=firefly-linux-kernel-4.4.55.git

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

ccf70001a61070ef0ae081b7ce7bcbffea0291df