From: lhh <lhh@rock-chips.com>
Date: Fri, 10 Dec 2010 06:24:03 +0000 (+0800)
Subject: Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10959
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b3c73f1be8ea83352f7ea73c98444a95592317e;p=firefly-linux-kernel-4.4.55.git

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

5b3c73f1be8ea83352f7ea73c98444a95592317e