From: ywj <ywj@rockchip.com>
Date: Thu, 16 Aug 2012 10:23:33 +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~8921
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c6254864f3e8a46943dfd9702cfdcc2943341b0;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
---

2c6254864f3e8a46943dfd9702cfdcc2943341b0