From: John Stultz Date: Wed, 11 Jun 2014 19:24:59 +0000 (-0700) Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 X-Git-Tag: firefly_0821_release~3680^2~4^2~15^2~9 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e0967f127480c39317c7ff15e018ce0d7c40774;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- 7e0967f127480c39317c7ff15e018ce0d7c40774