From: John Stultz Date: Fri, 3 Jan 2014 04:11:06 +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~36^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3de283fd5a5a1db9ea3d97da3825cddcedc9a9bb;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- 3de283fd5a5a1db9ea3d97da3825cddcedc9a9bb