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

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

82a2ca3d3664f78f7d3777ae86e964e371098622