From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 19 Dec 2013 05:51:33 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~179
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=188c91c2f4c54d8265ed947886ec1bbcf8f24e99;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

188c91c2f4c54d8265ed947886ec1bbcf8f24e99