From: 杨云 <yangyun@rock-chips.com>
Date: Wed, 20 Jul 2011 01:56:48 +0000 (+0800)
Subject: Merge branch 'develop' of /home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10110
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be8970a989ce582d223b1b28023cc392594d1f6a;p=firefly-linux-kernel-4.4.55.git

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

be8970a989ce582d223b1b28023cc392594d1f6a