From: chenli <chenli@rock-chips.com>
Date: Mon, 10 Sep 2012 03:07:54 +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~8677
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4ad0a8465132a81b7e1e91e69aa299fb40dda9e0;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
---

4ad0a8465132a81b7e1e91e69aa299fb40dda9e0