From: zwp <zwp@rock-chips.com>
Date: Fri, 30 Dec 2011 06:18:00 +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~9691
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2595b45270e3e08fbb3121647031dd39827ea307;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
---

2595b45270e3e08fbb3121647031dd39827ea307