From: yangkai <yk@rock-chips.com>
Date: Tue, 4 Sep 2012 06:56:57 +0000 (+0800)
Subject: Merge commit 'c13d296672e1d180c0268ca8dededa535ca67c31' into develop-3.0
X-Git-Tag: firefly_0821_release~8742
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc146370e5407a48d5669232ef78d7c18dff2743;p=firefly-linux-kernel-4.4.55.git

Merge commit 'c13d296672e1d180c0268ca8dededa535ca67c31' into develop-3.0
---

fc146370e5407a48d5669232ef78d7c18dff2743