From: roger <cz@rock-chips.com>
Date: Mon, 22 Sep 2014 07:33:13 +0000 (+0800)
Subject: Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
X-Git-Tag: firefly_0821_release~4640^2~7^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c5ac925e3274c1a049522c0dc576a65c8692d18;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
---

0c5ac925e3274c1a049522c0dc576a65c8692d18