From: lintao <lintao@rock-chips.com>
Date: Wed, 4 Sep 2013 03:34:44 +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~6665
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e51ad7bede9439b2289f6fef00b4529ac6c6ec3d;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
---

e51ad7bede9439b2289f6fef00b4529ac6c6ec3d