From: wlf <wulf@rock-chips.com>
Date: Wed, 26 Mar 2014 12:59:24 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
X-Git-Tag: firefly_0821_release~5796
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cebb1244592fcc857fc92101af6f1a07d857484;p=firefly-linux-kernel-4.4.55.git

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

5cebb1244592fcc857fc92101af6f1a07d857484