From: kfx <kfx@rock-chips.com>
Date: Tue, 10 Jul 2012 06:57:28 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
X-Git-Tag: firefly_0821_release~8912^2~102
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10690a80e1ab88cdab62dba89818b7a8ed1afa4f;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928
---

10690a80e1ab88cdab62dba89818b7a8ed1afa4f