From: wdc <wdc@rock-chips.com>
Date: Tue, 12 Jun 2012 04:27:12 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
X-Git-Tag: firefly_0821_release~9109
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fda50d5d17056e1902ae29ce7fe2e3b72cc62b3b;p=firefly-linux-kernel-4.4.55.git

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

fda50d5d17056e1902ae29ce7fe2e3b72cc62b3b