From: lhh <lhh@rock-chips.com>
Date: Thu, 28 Oct 2010 03:46:42 +0000 (+0800)
Subject: Merge branch 'develop' of lhh@192.168.1.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~11037
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0429b3a00197431ae88c4355a6f9b1354db41d76;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop' of lhh@192.168.1.29:/home/rockchip/kernel into develop
---

0429b3a00197431ae88c4355a6f9b1354db41d76