From: lhh <lhh@rock-chips.com>
Date: Thu, 23 Dec 2010 07:23:12 +0000 (+0800)
Subject: Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10899
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9848bcb15d1495a8945bc3526711749908d4e334;p=firefly-linux-kernel-4.4.55.git

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

9848bcb15d1495a8945bc3526711749908d4e334