From: zwp <zwp@rock-chips.com>
Date: Thu, 5 Jan 2012 03:40:31 +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~9688
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc5b9a6730129b75eae762ab35e1a1e45212cba2;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
---

fc5b9a6730129b75eae762ab35e1a1e45212cba2