From: John Stultz <john.stultz@linaro.org>
Date: Mon, 10 Mar 2014 18:35:09 +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~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a3b71254e95dc167ddca600c0ca426e8ce2fad3f;p=firefly-linux-kernel-4.4.55.git

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

a3b71254e95dc167ddca600c0ca426e8ce2fad3f