From: 陈亮 <cl@rock-chips.com>
Date: Thu, 31 Jul 2014 12:37:07 +0000 (-0700)
Subject: Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10... 
X-Git-Tag: firefly_0821_release~4916^2~96
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0d2690fd73c55799207cfb591bc1ec9b0e49c9a9;p=firefly-linux-kernel-4.4.55.git

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

0d2690fd73c55799207cfb591bc1ec9b0e49c9a9