From: hwg <hwg@rock-chips.com>
Date: Mon, 14 Jan 2013 15:08:17 +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~7957
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98bd6e860661bacdf45efb77b53b026645267863;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
---

98bd6e860661bacdf45efb77b53b026645267863