From: CMY <cmy@rock-chips.com>
Date: Sun, 1 Apr 2012 06:42:48 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into new
X-Git-Tag: firefly_0821_release~9514
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a6cca3888d3a6aed6bfb1462053bfd4b2e4cd70e;p=firefly-linux-kernel-4.4.55.git

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

a6cca3888d3a6aed6bfb1462053bfd4b2e4cd70e