From: lyx <lyx@rock-chips.com>
Date: Wed, 23 Feb 2011 07:46:34 +0000 (-0800)
Subject: Merge branch 'develop' of lyx@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10756^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=846c220c428469661d8f9d89be9afd1e0220498f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop' of lyx@10.10.10.29:/home/rockchip/kernel into develop
---

846c220c428469661d8f9d89be9afd1e0220498f