From: John Stultz Date: Fri, 13 Dec 2013 02:52:34 +0000 (-0800) Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 X-Git-Tag: firefly_0821_release~3680^2~4^2~38^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af3c969e503a355a0ba4f9c6b98a4c0dd20705ab;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- af3c969e503a355a0ba4f9c6b98a4c0dd20705ab