From: lzg <lzg@rockchip.com>
Date: Mon, 1 Aug 2011 03:33:12 +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~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=103e6d220dccfd05085f4eca0662e85157944808;p=firefly-linux-kernel-4.4.55.git

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

103e6d220dccfd05085f4eca0662e85157944808