From: 陈辉 <chenhui@rk29.(none)>
Date: Tue, 19 Apr 2011 01:39:05 +0000 (+0800)
Subject: Merge branch 'develop' of /home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10458
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7c99ee85066f6c0e06b9a107b4f06802fc83a77;p=firefly-linux-kernel-4.4.55.git

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

b7c99ee85066f6c0e06b9a107b4f06802fc83a77