From: libing <libing@rock-chips.com>
Date: Sat, 24 Aug 2013 08:23:01 +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~6689
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b6b0f8a4c2169785f94087cd4eec0dcd9a7ca920;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
---

b6b0f8a4c2169785f94087cd4eec0dcd9a7ca920