From: jiangyk <rich@rich_ubuntu.(none)>
Date: Fri, 3 Sep 2010 03:56:51 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11194
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad83cde0502ff31f0158f52e7972419ff29f1244;p=firefly-linux-kernel-4.4.55.git

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

ad83cde0502ff31f0158f52e7972419ff29f1244