From: wdc <wdc@rock-chips.com>
Date: Fri, 16 Aug 2013 09:27:38 +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~6726
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16fec066a58c111d01c85f0fe585267100ae207e;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
---

16fec066a58c111d01c85f0fe585267100ae207e