From: yangkai <yk@rock-chips.com>
Date: Tue, 16 Oct 2012 07:53:18 +0000 (+0800)
Subject: Merge commit 'a8aea20e19ead970a19154695905079cd81ded6b' into develop-3.0
X-Git-Tag: firefly_0821_release~8408
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d6e91f3b93e0df062ab65f68376eccab98f6d4f;p=firefly-linux-kernel-4.4.55.git

Merge commit 'a8aea20e19ead970a19154695905079cd81ded6b' into develop-3.0
---

7d6e91f3b93e0df062ab65f68376eccab98f6d4f