From: wdc <wdc@rock-chips.com>
Date: Sat, 24 Mar 2012 08:00:36 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
X-Git-Tag: firefly_0821_release~9600
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68b7e96796761d29ce877611a0d8c3dd302b3545;p=firefly-linux-kernel-4.4.55.git

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

68b7e96796761d29ce877611a0d8c3dd302b3545