From: lzg <lzg@rockchip.com>
Date: Fri, 12 Aug 2011 07:26:21 +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~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b17df265d5cd5715e0ff41132743f64f5b879d3;p=firefly-linux-kernel-4.4.55.git

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

9b17df265d5cd5715e0ff41132743f64f5b879d3