From: xbw <xbw@rock-chips.com>
Date: Fri, 17 Aug 2012 02:49:46 +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~8918^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66add5546775bc3ba20ec1d21ed22c313879a6b4;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
---

66add5546775bc3ba20ec1d21ed22c313879a6b4