From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 21 May 2015 02:13:07 +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~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=488d2f6a829adce190e196358cd619e1b0c414a9;p=firefly-linux-kernel-4.4.55.git

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

488d2f6a829adce190e196358cd619e1b0c414a9