From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 8 Oct 2012 02:35:25 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~8484
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb43413bdbb056bba3107202bf81ed1f247fcb3b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0
---

cb43413bdbb056bba3107202bf81ed1f247fcb3b