From: swj <swj@rock-chips.com>
Date: Fri, 30 Jul 2010 08:25:01 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11322
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8533bd2e7f714003f18f6cfacf3dee50ca67c28e;p=firefly-linux-kernel-4.4.55.git

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

8533bd2e7f714003f18f6cfacf3dee50ca67c28e