From: lhh <lhh@rock-chips.com>
Date: Thu, 16 Sep 2010 08:45:42 +0000 (+0800)
Subject: Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11133^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0cdb46c5d650490ffcfb05ca32383828968362b3;p=firefly-linux-kernel-4.4.55.git

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

0cdb46c5d650490ffcfb05ca32383828968362b3