From: yangkai <yk@rock-chips.com>
Date: Tue, 18 Sep 2012 09:15:04 +0000 (+0800)
Subject: Merge commit 'e79de8f8dedb7f1f42eb44965b349559264b9827' into develop-3.0
X-Git-Tag: firefly_0821_release~8608
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=85f3209ea8aa9ed40effbac69b1c8533a869a856;p=firefly-linux-kernel-4.4.55.git

Merge commit 'e79de8f8dedb7f1f42eb44965b349559264b9827' into develop-3.0
---

85f3209ea8aa9ed40effbac69b1c8533a869a856