From: xbw <xbw@rock-chips.com>
Date: Tue, 4 Mar 2014 06:47:55 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
X-Git-Tag: firefly_0821_release~6224
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ed67616745f8d2d6c2199b65b7dc52e7faf3d80f;p=firefly-linux-kernel-4.4.55.git

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

ed67616745f8d2d6c2199b65b7dc52e7faf3d80f