From: xbw <xbw@rock-chips.com>
Date: Tue, 25 Feb 2014 04:35:25 +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~6293
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cbd50029caef2dc4cc5c8a4632d49af1aee7a0e;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
---

5cbd50029caef2dc4cc5c8a4632d49af1aee7a0e