From: John Stultz <john.stultz@linaro.org>
Date: Mon, 4 Nov 2013 22:48:40 +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~41
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=354d86f4daecdc3553830e553f6fc17add736234;p=firefly-linux-kernel-4.4.55.git

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

Merge "official" android-3.10 branch in w/ older experimental/android-3.10
to update lsk targetted branch to the official branch w/o any rebase trouble.

Signed-off-by: John Stultz <john.stultz@linaro.org>
---

354d86f4daecdc3553830e553f6fc17add736234