From: libing <libing@rock-chips.com>
Date: Sun, 30 Mar 2014 15:08:30 +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~5710
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=14a185e7d24b0e68fe269ad29d9b698797c7359e;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
---

14a185e7d24b0e68fe269ad29d9b698797c7359e