From: yangkai <yk@rock-chips.com>
Date: Tue, 20 Dec 2011 07:16:51 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9709
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=081485562911dcb831d90fdc9687e211c414f495;p=firefly-linux-kernel-4.4.55.git

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

081485562911dcb831d90fdc9687e211c414f495