From: xbw <xbw@rock-chips.com>
Date: Sun, 12 Aug 2012 05:33:05 +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~8922^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4d6da95b633d3cac18cd6431281cb2a2d02ef58;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
---

b4d6da95b633d3cac18cd6431281cb2a2d02ef58