From: John Stultz <john.stultz@linaro.org>
Date: Fri, 3 Jan 2014 21:22:53 +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~36
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e2fd4ee5b215a638340ede00ecb3e249fa012f61;p=firefly-linux-kernel-4.4.55.git

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

e2fd4ee5b215a638340ede00ecb3e249fa012f61