From: swj <swj@rock-chips.com>
Date: Mon, 13 Sep 2010 09:09:34 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11152
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=632e24ad9620a1dd76938d6faac5ab5b2317960f;p=firefly-linux-kernel-4.4.55.git

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

632e24ad9620a1dd76938d6faac5ab5b2317960f