From: root <root@lbt-desktop.(none)>
Date: Thu, 12 Aug 2010 01:22:38 +0000 (+0800)
Subject: Merge branch 'develop' of lbt@10.10.10.201:/home/rockchip/rk2818/kernel into develop
X-Git-Tag: firefly_0821_release~11273
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a9e02d088a435b20eb043ef771d0092d793cb6a;p=firefly-linux-kernel-4.4.55.git

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

4a9e02d088a435b20eb043ef771d0092d793cb6a