From: yzq <yzq@rock-chips.com>
Date: Sat, 27 Aug 2011 07:53:17 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~88
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3f0cf91bc50a4d16daa1fec17eac9fb37b06ca4c;p=firefly-linux-kernel-4.4.55.git

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

3f0cf91bc50a4d16daa1fec17eac9fb37b06ca4c