From: li bing <libing@rock-chips.com>
Date: Sun, 28 Sep 2014 01:35:49 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my_wifi
X-Git-Tag: firefly_0821_release~4640
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1474c71bcf2df2d45296aa936e7437998bd4785c;p=firefly-linux-kernel-4.4.55.git

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

1474c71bcf2df2d45296aa936e7437998bd4785c