From: John Stultz <john.stultz@linaro.org>
Date: Wed, 11 Jun 2014 20:59:48 +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~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9c3d0450fb5c3b04b2fc9819d21c8e4e85040bfa;p=firefly-linux-kernel-4.4.55.git

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

9c3d0450fb5c3b04b2fc9819d21c8e4e85040bfa