From: xwj <xwj@rock-chips.com>
Date: Sat, 11 Sep 2010 05:16:21 +0000 (+0800)
Subject: Merge branch 'develop' of xwj@10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11161
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10a5f3d7c4086c47df5a25b028b6dea29fd064e3;p=firefly-linux-kernel-4.4.55.git

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

10a5f3d7c4086c47df5a25b028b6dea29fd064e3