From: zsq <zsq@rock-chips.com>
Date: Thu, 21 Jun 2012 03:00:01 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9074
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1f406cdfac881cb4c92d935c81ec38a47164e7f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
---

d1f406cdfac881cb4c92d935c81ec38a47164e7f