From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 12 May 2015 07:18:24 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
X-Git-Tag: firefly_0821_release~3680^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=54db03197e2d0aca252bc377938777b30d3e7f10;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
---

54db03197e2d0aca252bc377938777b30d3e7f10