From: John Stultz <john.stultz@linaro.org>
Date: Tue, 22 Jul 2014 17:10:19 +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~22
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5c6513f5536bc8bf94aa7a54c17c3b2cbdee29db;p=firefly-linux-kernel-4.4.55.git

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

5c6513f5536bc8bf94aa7a54c17c3b2cbdee29db