From: swj <swj@rock-chips.com>
Date: Wed, 11 Aug 2010 02:50:21 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11280
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e73284dbf3689573e2bc902984900633487c125c;p=firefly-linux-kernel-4.4.55.git

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

e73284dbf3689573e2bc902984900633487c125c