From: lzg <lzg@rockchip.com>
Date: Tue, 26 Jul 2011 09:37:34 +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~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a6e03b671d2d6ef991283dff80645fc3719d61d6;p=firefly-linux-kernel-4.4.55.git

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

a6e03b671d2d6ef991283dff80645fc3719d61d6