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

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

e9637cfdd534b80db909fcfe51a1892846bc9c94