From: yangkai <yk@rock-chips.com>
Date: Sat, 1 Sep 2012 08:58:00 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~8765
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=472cfd60a0afce6d6ed207f0f05544ba660ce086;p=firefly-linux-kernel-4.4.55.git

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

472cfd60a0afce6d6ed207f0f05544ba660ce086