From: xjh <xujh@rock-chips.com>
Date: Wed, 7 May 2014 13:43:43 +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~5341
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c376ebabadc7570de3fb9c0eecdba3369f0184e;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
---

0c376ebabadc7570de3fb9c0eecdba3369f0184e