From: yzq <yzq@rock-chip.com>
Date: Fri, 30 Mar 2012 03:14:05 +0000 (-0700)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~9555
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d1e4a3acb30c62fe3e2d9677b5029b97cfabf79d;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
---

d1e4a3acb30c62fe3e2d9677b5029b97cfabf79d