From: yxj <yxj@rock-chips.com>
Date: Sat, 19 Nov 2011 09:29:43 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9735^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=977eb2b950e16d28ca58161600fa75330a47fc05;p=firefly-linux-kernel-4.4.55.git

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

977eb2b950e16d28ca58161600fa75330a47fc05