From: yangkai <yk@rock-chips.com>
Date: Tue, 11 Sep 2012 07:35:05 +0000 (+0800)
Subject: Merge commit 'c3bf6e05eb93a700ff8f72d596a9bbcb89196184' into develop-3.0
X-Git-Tag: firefly_0821_release~8657
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f6363341431b2a57e772e05cfd8d6d04f1bdcba;p=firefly-linux-kernel-4.4.55.git

Merge commit 'c3bf6e05eb93a700ff8f72d596a9bbcb89196184' into develop-3.0
---

7f6363341431b2a57e772e05cfd8d6d04f1bdcba