From: JacobChen <cc@rock-chips.com>
Date: Thu, 24 Nov 2011 12:05:13 +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
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bc3f71465241be339c8b075793712251ef45077f;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
---

bc3f71465241be339c8b075793712251ef45077f