From: eddie <cf@rock-chips.com>
Date: Thu, 1 Sep 2011 03:12:25 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~58
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cad859c55868e4ba922e9288a07e563a346fa6b8;p=firefly-linux-kernel-4.4.55.git

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

cad859c55868e4ba922e9288a07e563a346fa6b8