From: John Stultz <john.stultz@linaro.org>
Date: Wed, 26 Mar 2014 17:45:14 +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~30
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ed147970453d31b8586b6073765a9cffcb41b55;p=firefly-linux-kernel-4.4.55.git

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

6ed147970453d31b8586b6073765a9cffcb41b55