From: xxh <xxh@rock-chip.com>
Date: Fri, 9 Jan 2015 08:47:56 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into xxh_develop
X-Git-Tag: firefly_0821_release~4319
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bacbbaa5ba7e3c3753b786a6dd28ce6a06763e3a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into xxh_develop
---

bacbbaa5ba7e3c3753b786a6dd28ce6a06763e3a