From: Alex Shi <alex.shi@linaro.org>
Date: Sat, 18 Apr 2015 05:36:38 +0000 (+0800)
Subject: Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable... 
X-Git-Tag: firefly_0821_release~3680^2~12^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0bde84f40232e0f81bb9fa79d7953fed4a32811c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-3.10.y' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk
---

0bde84f40232e0f81bb9fa79d7953fed4a32811c