From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 25 Jul 2012 06:19:53 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f58192d21d6df9d0b633ff9ebf193bd10b818313;p=firefly-linux-kernel-4.4.55.git

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

f58192d21d6df9d0b633ff9ebf193bd10b818313