From: xbw <xbw@rock-chips.com>
Date: Tue, 4 Mar 2014 07:14:42 +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~6222
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4e2eaab7c0b7800a1625dd43d10c4179d8eef45;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
---

f4e2eaab7c0b7800a1625dd43d10c4179d8eef45