From: xbw <xbw@rock-chips.com>
Date: Sun, 27 Jan 2013 11:36:26 +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~7740
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc75323ce268fbc6e10b1f63f69f4bf4e3c8ad6f;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
---

fc75323ce268fbc6e10b1f63f69f4bf4e3c8ad6f