From: lzg <lzg@rockchip.com.cn>
Date: Wed, 18 May 2011 13:54:07 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10316
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d0aec26f4a4ad6be88c5c6fd77c6382fe74f1802;p=firefly-linux-kernel-4.4.55.git

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

d0aec26f4a4ad6be88c5c6fd77c6382fe74f1802