From: ywj <ywj@rockchip.com>
Date: Tue, 23 Jul 2013 11:08:44 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of 10.10.10.29:rk/kernel into develop-3.0
X-Git-Tag: firefly_0821_release~6857
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6746c8845f09c9f4771af87da76a51343f29636c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.0' of 10.10.10.29:rk/kernel into develop-3.0
---

6746c8845f09c9f4771af87da76a51343f29636c