From: wdc <wdc@rock-chips.com>
Date: Sat, 25 Feb 2012 06:07:25 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
X-Git-Tag: firefly_0821_release~9616
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f11c92675d91aa650a920f176face7bc0276af91;p=firefly-linux-kernel-4.4.55.git

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

f11c92675d91aa650a920f176face7bc0276af91