From: root <root@rockchip-MID.(none)>
Date: Wed, 27 Apr 2011 09:40:39 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10390
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b4249d5832322f24ed2d4f4375e4e464ef034b1b;p=firefly-linux-kernel-4.4.55.git

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

b4249d5832322f24ed2d4f4375e4e464ef034b1b