From: lintao <lintao@rock-chips.com>
Date: Fri, 2 Aug 2013 10:13:13 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~6765
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef39e5ccd31a1a98f6f71788efa0d06ddff7001e;p=firefly-linux-kernel-4.4.55.git

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

ef39e5ccd31a1a98f6f71788efa0d06ddff7001e