From: Zheng Yang <zhengyang@rock-chips.com>
Date: Thu, 27 Sep 2012 06:16:01 +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~8551
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ec125b2e97c75c131c02e3e09540da38f327c633;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
---

ec125b2e97c75c131c02e3e09540da38f327c633