From: xbw <xbw@rock-chips.com>
Date: Wed, 21 Sep 2011 06:23:54 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f42cd1aee38130e25caa0dec15889d149f932f88;p=firefly-linux-kernel-4.4.55.git

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

f42cd1aee38130e25caa0dec15889d149f932f88