From: John Stultz <john.stultz@linaro.org>
Date: Tue, 14 Jan 2014 00:37:35 +0000 (-0800)
Subject: Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
X-Git-Tag: firefly_0821_release~3680^2~4^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30e9c9b6c2b0e3a6b7977029403512b27802730b;p=firefly-linux-kernel-4.4.55.git

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

30e9c9b6c2b0e3a6b7977029403512b27802730b