From: John Stultz Date: Thu, 7 Aug 2014 17:32:25 +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~5 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b738a3e88049258f2c3de4e3fcf181100cb558a5;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- b738a3e88049258f2c3de4e3fcf181100cb558a5