From: John Stultz <john.stultz@linaro.org>
Date: Mon, 14 Apr 2014 19:01:11 +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~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc5c002a715ff92fa69ec3fd045568ddce47d538;p=firefly-linux-kernel-4.4.55.git

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

fc5c002a715ff92fa69ec3fd045568ddce47d538