From: John Stultz <john.stultz@linaro.org>
Date: Thu, 7 Aug 2014 17:32:42 +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~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=caaee576f10eda28ee7ccce4947be1c231c60f62;p=firefly-linux-kernel-4.4.55.git

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

caaee576f10eda28ee7ccce4947be1c231c60f62