From: Alex Shi <alex.shi@linaro.org>
Date: Sun, 28 Sep 2014 09:26:52 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4bf0007cd4a5bd51dcc87625818a836faf96699;p=firefly-linux-kernel-4.4.55.git

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

c4bf0007cd4a5bd51dcc87625818a836faf96699