From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 21 Aug 2012 11:55:23 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0
X-Git-Tag: firefly_0821_release~8882
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0a3b24f10de08e49e0946aa4ea188f37fe0c97f7;p=firefly-linux-kernel-4.4.55.git

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

0a3b24f10de08e49e0946aa4ea188f37fe0c97f7