From: xbw <xbw@rock-chips.com>
Date: Fri, 28 Sep 2012 10:19:25 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~8504
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9daa908a12f41557d4980a9d5c243b7e23f19e59;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
---

9daa908a12f41557d4980a9d5c243b7e23f19e59