From: John Stultz <john.stultz@linaro.org>
Date: Tue, 12 Nov 2013 22:23:31 +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~40
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9afad163d196bfc4654209e00687b813cdff49ee;p=firefly-linux-kernel-4.4.55.git

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

9afad163d196bfc4654209e00687b813cdff49ee