From: swj <swj@rock-chips.com>
Date: Wed, 28 Jul 2010 13:20:23 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11329
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a9dbad035b2e8499dae632e62675db307e6fcb9f;p=firefly-linux-kernel-4.4.55.git

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

a9dbad035b2e8499dae632e62675db307e6fcb9f