From: John Stultz <john.stultz@linaro.org>
Date: Wed, 16 Jul 2014 00:41:18 +0000 (-0700)
Subject: Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
X-Git-Tag: firefly_0821_release~3680^2~4^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa7654b7e91cc5306e249771c3ad2fbb3e082e11;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
---

aa7654b7e91cc5306e249771c3ad2fbb3e082e11