From: CMY <cmy@rock-chips.com>
Date: Sun, 20 Nov 2011 06:10:58 +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~9734^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28ddf9aca06e27b94b3e5e8eae73a3838695960f;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
---

28ddf9aca06e27b94b3e5e8eae73a3838695960f