From: cwz <cwz@rockchips.com>
Date: Fri, 8 Apr 2011 07:26:03 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10543
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=692dc89b93e7a0118e95cb95ede7f7e0990043b0;p=firefly-linux-kernel-4.4.55.git

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

692dc89b93e7a0118e95cb95ede7f7e0990043b0