From: cmc <cmc@rock-chips.com>
Date: Fri, 17 Dec 2010 07:06:34 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10925^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63eb7c0f411c681f16d5972a0327ab65985a2dea;p=firefly-linux-kernel-4.4.55.git

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

63eb7c0f411c681f16d5972a0327ab65985a2dea